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 4252929f87b8..8cf631a27fda 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1 +1,2 @@
 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
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 f17e0eef0763..964b037f8e2c 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,2 +1,2 @@
-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
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 67022ca9598a..393d4983539b 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1 +1,2 @@
 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
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 2eaaf86ccb3c..8ae23bde4c80 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -8,3 +8,4 @@ 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
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 cee333ff419d..a5f94e3511b7 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1,2 +1,2 @@
-DIST Bitwarden-1.25.1-amd64.deb 58573904 BLAKE2B 109bec39c1a385127b00222752f6eac906cdea19df790dfede0f8dd6e2febdf35958b2b420737cf2dbfdd9648a85b93810ad1f8e2d6a222dcd07437d9333e7d7 SHA512 b20c5c3890a98f6990f7e7f1274027aba3011a416781b6fd76b6c37959ebf787cdb129dd16fe9b4601b5cbc39018dadc36efe680391c04ed0a4c763d221a3cbd
 DIST Bitwarden-1.26.4-amd64.deb 58223196 BLAKE2B 38726d9feb35f15130e81a479d74e5c80d344656d46dd9b9e82a7deab9d83b21b3d0a30dc2e8fc9a371b72f2dabe06234c955077fd16163f8e8ad551b49e98c6 SHA512 b0de7ed7b00b5308a2137b2632150bd288a7383a13295814c6c6af1a85f911a6790ad162f67af07844f8fca80044b95f58a37e6ab762429d061f3c9af3616e11
+DIST Bitwarden-1.26.5-amd64.deb 58215042 BLAKE2B 216e5042e925bc12a9feb1c038cacddc05b6c4aad8b76413ec50771cbfdab399c64e8388277d571708094e6b14b7d89b3c20ffd3d23d4010340b9d94068560cc SHA512 c2506a9f64d47138e6ce53bb7211e2562f9bb9847f4b48b059dd504eec312f6852571aaa550830f54488c0d67d02c0eb67bcac049a688098d1b8a55492b008f7
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 5f7b02c6f3ff..5e625bbc7d76 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1 +1 @@
-DIST exo-1.30.0.tar.gz 5372917 BLAKE2B 2ceb1edf18296bdbaa14a0c4af541a224b0d8376a3afe528907962f278c7cba89761c868c739f97ebfbe7222bccee1c5dc6af4d1490155928cfbe4bf5f195507 SHA512 02c09a950f9b32d6c5804a8100dac8ef8cdb35f3f4d93237affd3c150e7cd00a01a8cadeea68edacf42f1925994bc73359b6d512666d919b74d6d06db2a43cb6
+DIST exo-1.31.0.tar.gz 5411379 BLAKE2B cc97c8f7aff6dd563aaec9701c19cfeed408f42b20ebb34ab90f15ec694e927c64f50dc3b5eda91af2a292609bf8b43ee005c6b5f1a152a0eb491d0f354618f2 SHA512 6f3a92210fb03cc0aa255bd91ffe884fb99d29f82e81919a1e9e82cfdfbfb09ee739e906032338494019656fc398cc49f2dfb48dbb01d68573fb6dab79afeb5c
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 b5e5c744f8e5..53787caf2778 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1 +1,2 @@
 DIST hcloud-1.22.1.tar.xz 910672 BLAKE2B 51e18c530964677bd0cef8232c68031f3186b83fe0da91e8c6572b95130df32e5b00de6e734fb6cce56a51b6fca6136bb306d33ad4a6c728aac3d0afe634c738 SHA512 365823e779f526ae9cbbb50ecaed557c5a838b6614208e4d03e7eadb9569a2e2156e05e019aea2623a811defda707b8822d0eb09a4bfd7006262bd6a19e09aae
+DIST hcloud-1.23.0.tar.xz 1129416 BLAKE2B b91e0a5f24020cd250a0e50c4c2b049397575e884968652f6795e89340a90f43141deee7179944e2027992f6f722a75704c3cb8fb0b0e0653036e9b5c34258d4 SHA512 d16d5eb28873045ba1ed0b09a6a76b26c3e39fffd404fca233d79640c06cb75fe2a13db22d9c343890bfb5ebac0535c7e7fae8e37e96229ddd5d324b2a9d4c79
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/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 26b554105c04..b28ace3e4c63 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,10 +1,4 @@
-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
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/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 9fb52075f90a..20dffabca5d0 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1 +1,2 @@
 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
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 c7e58feec235..159a45ffdd5c 100644
--- a/app-arch/makeself/Manifest
+++ b/app-arch/makeself/Manifest
@@ -1,2 +1,3 @@
 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
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 4f553a412796..be60a8bdd625 100644
--- a/app-backup/bacula/Manifest
+++ b/app-backup/bacula/Manifest
@@ -1,5 +1,6 @@
 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
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/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 745cd271c340..bf2b882ed4ef 100644
--- a/app-backup/snapper/Manifest
+++ b/app-backup/snapper/Manifest
@@ -1,3 +1,3 @@
-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
+DIST snapper-0.8.16.tar.gz 397215 BLAKE2B b59563746b89916f2906de61d7b7e1bd50be18095fa1ce18bb60e2e7103c5bc11dd1590d776eea2567a2ec39c5c01745afa83a0bc2e2f57142bab1aa68be7638 SHA512 91fb648a32de7c2e9cd549aab2545c75e3bad6a4d52446cb93089469ae6d76ad536f5dcce21b77f633907e9394b44928e99a9003ae6be5508d3fcff0c3fd4aae
+DIST snapper-0.9.0.tar.gz 399600 BLAKE2B 546fcdd8beb4b5404bb718577d53aa284f04a5a5cf1453849158f963604fe34fed0f3f99325449f9805779e845fc6a105008890ed2d2c63d3e0dde33d1d77350 SHA512 0861621764b65365ea7e7cf48baa0c7a64351fed7fca439c91ebf8023dbad6d05c709a5c49b3755d1edbd1b98617b8c202239a63608c11aee808ac21d6a2b412
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 2639edb85c3d..7886770c2274 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,4 +1,3 @@
-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
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 2639edb85c3d..7886770c2274 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,4 +1,3 @@
-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
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 2639edb85c3d..7886770c2274 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,4 +1,3 @@
-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
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 2639edb85c3d..7886770c2274 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,4 +1,3 @@
-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
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/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/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 349c765dcd28..3e0ba464c201 100644
--- a/app-doc/cantera-docs/Manifest
+++ b/app-doc/cantera-docs/Manifest
@@ -1,2 +1 @@
-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
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 f004ef6a5c14..633f22c67a19 100644
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@@ -1 +1 @@
-DIST kicad-doc-5.1.9.tar.bz2 74200779 BLAKE2B 9bca24edd9b73a2a532740538dd253a445e8acd1fa56179173be5f231be9781dfd63451e5ad1b4ebe8f676101f0db838f7acc032a5e0b0b21a073332e4978f6b SHA512 5c587fa7fe9611e76537efd8e6a1fc38ce299d1d5a974f27986925c5b6867287b5cd8350d53978e03ea5cff7c2782c1a0c12a5bc64c230973234cf2481a93f71
+DIST kicad-doc-5.1.10.tar.bz2 74201837 BLAKE2B 6e9810c1efc46c52c4d7f4818c8a5cf438bdde82971074cd8d59a1cf81431d77d3d09877666dba8d9c3af8a2b0bcb643352db0b9f95ec60b1c3325f0f2adc667 SHA512 2795bafe835c94ea169484e997cb57a0e8b419e6e7b28324f96602940e5d66762cdf594ec6503cb8718707d6dfddde2070aadc8e97888c0bf455ea56f625dd43
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/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/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..d652392dafc0
--- /dev/null
+++ b/app-editors/vscodium/Manifest
@@ -0,0 +1,3 @@
+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
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..a90bba907bc2
--- /dev/null
+++ b/app-emacs/libegit2/Manifest
@@ -0,0 +1 @@
+DIST libegit2-0.0.20200515.tar.gz 132122 BLAKE2B 2e8e06fb833e5ea2ee0f4e1fa760d30e91235a9b9c4a465de6d8a12d6c8431bdc85204546ba36c36f206e2788d9f1cda00d578c1c40057ccfb3f2117e8302013 SHA512 f604591ba272ea1cef8c428f644c0cfcc4ba2438a55c2b7a0dd1cdcb15836c755c0c6bdc6c42bd6da05935bba7fdac30efe65f26307599b07e591f4efdd1e897
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 809ca0f039b4..a378ce7e789b 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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/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 076c99373bbc..4a17ff222711 100644
--- a/app-emulation/snapd/Manifest
+++ b/app-emulation/snapd/Manifest
@@ -1,2 +1,2 @@
-DIST snapd-2.47.1.tar.xz 3664756 BLAKE2B 90cb117ea385890c38c6efdecd3652c115158ad769858ebe1a5035d37c9543da5b2a8768ce4f56cfcee053701d308f826bf7993d9b5f9d5313f2840ca829ab23 SHA512 e08dd7057b85b970a1177996c483d3f663b1424cdbf6643a69923a7012d38fc13109b449ce3a2c5c8d65e5836f93a36567f2f641a62caea6e9989a458f7f2892
 DIST snapd-2.48.tar.xz 3757292 BLAKE2B 4d1fd4b9ff3bd7cf05ebf0e27db4bcc87b5de689be470b4c62758e411e9d99a541ae084c7b1afe4ede44ad6dce19a53b337dcddc18d0b82957ef537f466e720a SHA512 27e1924d86296a969cd18980d6100c8e41be66f2ad0214ac2857580a2686b1e7ef01e2561c6ed532106eadb1ac2d5fd070ef9eb05e5fabfb8fa9a98456259b89
+DIST snapd-2.51.tar.xz 4036884 BLAKE2B debdfe51407306451ecdb7851e3768be5aa5b9714b2861cb17e9989194dfbf441b1569955c6440a7d44f1d36996b398bcf60b903a76116e14dcc3173625e105c SHA512 959cceb8fcb326a14557347cecfb931763084e00639b828dc539646d2988cdeb3c9276ab8b770c6bbe37c7a05fb6548f609f490c55f7ee28713a4eb80cf3da15
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/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 5bdbd3695f38..957407c11fcc 100644
--- a/app-emulation/virt-what/Manifest
+++ b/app-emulation/virt-what/Manifest
@@ -1,3 +1,4 @@
 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
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 5d860c4f8ecc..55629582755d 100644
--- a/app-emulation/wine-mono/Manifest
+++ b/app-emulation/wine-mono/Manifest
@@ -1,17 +1,3 @@
-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
+DIST wine-mono-6.2.0-x86.msi 87498240 BLAKE2B f7e20876732cbdfc472d5f850b167feceb4e09dd1d14db2d5e81580fb28cb1ec2fc7d1a48a187a0b0d0ad3884c3880a9f3512efdc5ace02795c3158b404a6770 SHA512 99007d7bf3bbdb97babdcc9411a3c9583c261918889e72f785e41cc0638fe4774d81040eebb7d3547ac2609a4684263feefa9e70b662f277ea1717dbd604d3d2
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 a0e39c7f41a5..216adf6768cf 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,9 +1,9 @@
 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
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 ff97c4833055..05996fd0c555 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,6 +1,6 @@
 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
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 6641869b1691..605676069b91 100644
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@@ -1 +1,2 @@
 DIST eselect-repository-10.tar.gz 7123 BLAKE2B 786255e8b83c1348c16ec6e30495e7a0c305d48430712fd2bba28367d27d0e5eea1fe9176636f7896f48feebb71a9a3daa025fdc2f8032d2e6a3c59bd6b5c0c4 SHA512 4a03e1b9ddf3d8f79429e0a98cd03804867ba4594945ddda518be06c07e6e5737c77b8c57893a8cf5930548c96f0d436786d95bed624041ad52ab603348337b2
+DIST eselect-repository-11.tar.gz 8554 BLAKE2B c7bdd1559c310c492b2c00c7a7cb92d48ad24a69ff4485c1282c67b7dd211360fcda6d96eec2b9e734a1b4745f2a0fe9da1ff20d62bf1174a64b6016097ea634 SHA512 31b0b36122e580a018ca66d112cdddfbfe1568030fb9a20440450c17c759bfb872eb7ef99036a3dae14e8384a8f770354fd4cd362ed594408ae9e8dbbc6dea68
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/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/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/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 deea6326c413..ba72570b6db6 100644
--- a/app-misc/filebus/Manifest
+++ b/app-misc/filebus/Manifest
@@ -1 +1,2 @@
 DIST filebus-0.2.0.tar.gz 7895 BLAKE2B d113ab7e57ee24371dc9adbeb4767f533007d36cee2a3f55ee7bbcf13c31980355cfee2db748ef6c485bad3cb8c68ba1c31f9829b0c6365fa3b63c4899fb8b02 SHA512 fc7083444a67e36778d15a8af38487024ab661d32b891cfc735fd31cce2ddecfff3ef63c591106d97250373dac9aeef8dd0e8cf0ec260b2d67031018fe66249f
+DIST filebus-0.3.0.tar.gz 16921 BLAKE2B 60ec7eb3fb584c053f00301898b914ba9034e3aaa79a79eecdc31f8e1abd1db5c473486e02761adee537faca6725916cf327e38376bdbbeac2c8548be427089b SHA512 a7dd4cbe96e6e691794ea21b23f79caee518855235c1ee35f857fe2938f437095a9199eb9bf309087cef523b6dfa963f3635d94e9b7ece15bbe1b4284fca793c
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/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/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/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 847afa4f11d7..000000000000
--- a/app-misc/jitac/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jitac-0.3.0.src.jar 141514 BLAKE2B 7f8028f2971c55d84710a232f32f187f3239e08461e9c534ad5d014f19741c088cd3a294ed1705ef7a940d94163788fd9749b037385c91c2d1b4c639e18d9dbd SHA512 8a21e80246e450c9afb7e92cad14b8901fab7e039a7312df0b87cdab307c68a3db8a1090cb044b74c50eee47dd480f8c8d1465111e2f508584d38c9ef31511f8
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/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 51100233c365..7445dcee28ba 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,2 +1 @@
-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
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/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 0abaeb5f7fe4..8fe593248b55 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,2 +1,2 @@
-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
+DIST trash-cli-0.21.5.25.tar.gz 77067 BLAKE2B 5db46b21ba33b9076ea7f024b93e62f30b3671f44a024b30013369607bd580f0ef9831debd9fdc6c64575ab6edde14aa921229bbd16a6a77657b7ed20b58c318 SHA512 75ef338b356048768febc4afd42933d8aa44cde5156e386968dad7b33033b84becaef3d39ccf15c02216394735f37d1c7c8cd499000068d51247710e87590507
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 a1304097b3e4..000000000000
--- a/app-office/hourglass/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST hourglass-0.7.2-src.tar.gz 119371 BLAKE2B 8581ecc0e5c53b7e19dc0ac4514c49241246b0aa11a757d37bc1bd7183db5441e57a8c85a4e9887b53b3514ccbeebdd625e3bca3928240b32b3bffabcc55faeb SHA512 c15c9c6268f2f99ff2138764197b70480566926d524ce22039c85b7ddd11e1429e9f40c07691e4cfaccc9899e27f3d808e2cdf31d207c379dd67e5bd3c0f325e
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 620e8ef4aea3..000000000000
--- a/app-portage/demerge/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST demerge-0.047.tar.gz 11142 BLAKE2B aba6e40d9a47032782bafe0bfc77f0bdda7e9782daac56712025c6a544db5624a824cfb1db8b32d2dc61a3e3c561432159eb8208bc5da6f94745ec603a457420 SHA512 6c2d172694516c030c358c9668ff4a1fe54d910583de6829bec0de6e67d428b1853b23f6ccd18fc9286932cb9a2bc5a37bab4b5ce43ddf2dd031c64c2ee6b1ce
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 acf9d04877f5..3fa275baa37c 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1 +1,2 @@
 DIST eix-0.34.12.tar.xz 629704 BLAKE2B 22c3a93b47c607467321445704c8b4fe0f8b131081609709ebe5e2bd09d0ac08194938641ab44304e51d9dc4d473615625a9ca0de649767b6552c60d38974b75 SHA512 458a01b8ccb5fe4c7fbf9eb8368dbb0c63ac587e0452de4c3a58fadfc62aa8b404e509d6f24d20956bd6f04c00bfdfc95d6bf59287c5ea9e07091bea67f8c4e2
+DIST eix-0.35.0.tar.xz 636432 BLAKE2B 8a880cde56c0010f193445d9813c533effd59b8ee570132a0c40d62de827968839d99ee16981d152e737b881519e9f73d4ddac5375b6339dd480064deefa6149 SHA512 b9a6e59e666ec6015a612e083839a11a77e1d649262a802a9c8684fe25abbeda7a2c51ea629f1bb85ddc77fccce42b577178284763668bb2d1bcc85df5d68f2e
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/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..530822018fb4
--- /dev/null
+++ b/app-portage/kuroneko/Manifest
@@ -0,0 +1 @@
+DIST kuroneko-0.1.0.tar.gz 8964 BLAKE2B 051539ab6714332b02188854debe655d405093418a3edcf88f58bc54f153c5e9cecf9f9ab165ea32e9dc1d967c43618249b2a6677cb74ea020b05def99479d1b SHA512 b4f9e4cbf932927549ab1411aba15e8ca394919e80a19f7bd04a560764d74c7c884e96133c9aad1be69f9646b1d37713dfb449a1ca09bd74d407101789c213c1
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 eb5229e174a9..000000000000
--- a/app-portage/perl-info/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST perl-info-0.16.tar.gz 2058 BLAKE2B 07691f2b2bbc36c171706e55257d8ed57a45f629e71e12d438d236a0d026d50fdf8a0ddc05644befb4d916cf8cb2ad6819753f27baf5e14ac00c86e331dfaeeb SHA512 4e37b2496d8a9490de9d105fcaf74ed24d7d2809a4aea4709d0f15811736a8101edf9a4274c82448c24be37692455350e490d29560e616d688da1e6d72d38483
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/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/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 de293be8cce3..a1301b00ad2f 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,2 +1 @@
-DIST tatt-0.7.tar.gz 21802 BLAKE2B a0195f253e2777a8756fd7d1f83804bf3a4ca90fdeb07b2f8dc28dcb6f1d1f3c47fd948e0d001103f7972dc8cb8ee45a237dd24b3dc149392aa9841fe3d6532a SHA512 1f2a144512801d50585d40074553049ebd08bc5f084a0623b89d901acb9448657e7f42f2c8da5f613e0b2ff5c3fe59fbada1ad911c9693846923e256a2e97ecd
 DIST tatt-0.8.tar.gz 22215 BLAKE2B 6c21acb9378045679c4a03badcb7c60638c4007ba19857d7519f68d4d658cd1418e952cf15a64679c6a9b28090856a588e60e9db1abb360d0625a633491deb3d SHA512 31be6573e3d7c9a690e57d64adcbf87983d5dd226afd162c7bfa425847a84705beda530cd5b648ac85cf8cd3907d46ae638bb0ca0d903d8d1968d0ac30703703
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 f34f75bc2620..0c7dc2fad1dc 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1 +1,2 @@
 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
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 e32cf7397c74..2620c5f6235d 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -1 +1,2 @@
+DIST aiksaurus-1.2.1-patches.txz 7196 BLAKE2B c6013301b924a9e6b4fde790bb56848c575f6a8c2a9934a263d3fdfe4a639082c9c1fdaeb0703854d8aba15479c2431738ffb9ef0b750118fd03d0e05a7c6bd3 SHA512 f3db9afbbff5c54d5203db1f09af219c6a6c217018745827b3bc523e156e7d24b197706486f5a88f5829548df88af471d3a7eabdefe7466297dccf786c840520
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
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/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/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/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/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/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/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/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..45c05e79768d
--- /dev/null
+++ b/app-vim/Vim-Jinja2-Syntax/Manifest
@@ -0,0 +1 @@
+DIST Vim-Jinja2-Syntax-0.0_pre20210604.tar.gz 4579 BLAKE2B a63888feaeea3eadb6eb733631241d0a3d9248387a21fb8391b9ea9e70d47bb17535c9baadef6577fdb714ae07cb7e35d1aee97320c155de0b67f6121fcc5747 SHA512 c563b28df738ab7b087637247c1ea4f644cde0d15ccad4f6f6edccf9a04712666ff32447e43b35fff389e50bc1f6b4addc2ff5857f4a1c683b8f02adbf3682c6
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 6b39cfd014ab..a2247d75b390 100644
--- a/dev-ada/asis/Manifest
+++ b/dev-ada/asis/Manifest
@@ -1,2 +1 @@
 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
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/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 2c16f18538ff..50c634ea719f 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,3 +1,4 @@
 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
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 4a891e4fda07..057b95bd783f 100644
--- a/dev-ada/gnat-suite-bin/Manifest
+++ b/dev-ada/gnat-suite-bin/Manifest
@@ -1,4 +1,3 @@
 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
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/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 a6f2df013b49..3d8c68748906 100644
--- a/dev-ada/gnatcoll-bindings/Manifest
+++ b/dev-ada/gnatcoll-bindings/Manifest
@@ -1 +1,2 @@
 DIST gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz 139910 BLAKE2B 5441c277d5888b040930960ed656a1b1264c7de02834995c6040c891b99bf7e8773029b9f722d5a3ed30036e7bd441318989ce3f7839d47928af5f4f7c396f90 SHA512 2b723ba4327966dc06594ccff45da3a01f65b8f8b91130ddc44d1b727d23ccbfe35f082c73810418da9d0705f1dc8ca9b471748eecee42adce34be722a4a201b
+DIST gnatcoll-bindings-2021-20210518-19B15-src.tar.gz 1425986 BLAKE2B c10fc6ff8bc74de37178a5e74d7ca81fd476c84765612b59c4a7711bfd6fb2428157bc12715e3813170c1403419ca89bdea55569f111c7a66130f689575fe368 SHA512 c2cae5bef27c19c46a69c188d111676cb6d68762e8666740dac69bddbeb350d56497ceceda5b6959e7810d51d98ead7827d95735bfc932c343cec5acee81b041
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/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/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 b1f5e6eda06c..b5542ae5b4dc 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,6 +1,4 @@
 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
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 569547f20cf8..ddd8baffeb2a 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,2 +1,3 @@
 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
+DIST gtkada-2021-20210518-1A011-src.tar.gz 12341654 BLAKE2B 888e7f447b09218f54f6fc28743bf313163f30bcde5f0deba7c02a113340e2e73458cc98a8e9d9277f131cb4e28280fd69afa6797d47312c61e7d73929fb5a11 SHA512 fb5db2886a26c15b58180e53f22d4ee25ce23c19240b27352cb47becf19bb76b32c90a10f5085165913360d1cf87bf52b4588d8cdc2b9681e717f9af71ae86a8
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/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/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 6e9128b98ae8..ba08382d8e1d 100644
--- a/dev-cpp/abseil-cpp/Manifest
+++ b/dev-cpp/abseil-cpp/Manifest
@@ -1,4 +1,5 @@
 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
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 70b9824bb8dc..b52819ecab8c 100644
--- a/dev-cpp/glog/Manifest
+++ b/dev-cpp/glog/Manifest
@@ -1,2 +1,2 @@
-DIST glog-0.3.4.tar.gz 522508 BLAKE2B 4a188d5998005b29afc52f2ea548f33e06a68da993bb74960e5aedb214ec52ef9e9fc39efb1a34f38f217b92df7db064ff01d58df36c3e4ad789becc97335ec2 SHA512 139525b546a9eccacc9bebf7cc3053ba52229e9488485ad45344c3d3134ca819d3b571250c0e3a6d84097009c8be89b0f4fa16ef5ec838ffcc237ae11c3a034c
 DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176
+DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a
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/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/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/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/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 6ff7af00eb81..133ba4d2cde9 100644
--- a/dev-haskell/integer-logarithms/Manifest
+++ b/dev-haskell/integer-logarithms/Manifest
@@ -1 +1,2 @@
+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
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/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 8c80d9fcc7a2..8cbf1ddcbe1f 100644
--- a/dev-haskell/unicode-transforms/Manifest
+++ b/dev-haskell/unicode-transforms/Manifest
@@ -1,2 +1 @@
 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
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 1c3fdbd3ed56..4482b5ba1fde 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,4 +1,2 @@
-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
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 9ccda10b7f7e..ae13922d56a2 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,2 +1 @@
 DIST bcpg-jdk15on-150.tar.gz 691012 BLAKE2B ee566fb6deb44177e31bfe80b6bd1f13d39d6820cffe3693bd85314ccfd65c4805275b3925d52a6bda6b1ad7e3ea267f1f0bed3926420b5920e5f300020ecd9a SHA512 763d253b9bb45b7e7fab75d557daa784c3d4a503ced979adc986e5688c3939db248853c864a2f4bec6d5b1dd9ed668d5f278c91b5607774fc703971d0b330fe6
-DIST bcpg-jdk15on-152.tar.gz 748424 BLAKE2B f847fa95ae4eff6c9c95f23ad318d3b967bd224a5dbaea20f8e904a50173076e16723519e8985d4afd2ac02c6a7fe83399e0c6005971bd460b41055c4866a506 SHA512 1619a8cd4024129876266415406882ac5df3dd84fd3e01d7593304874ad641fe72ae95150d0e4414b294e2e5ca8eb39e41a25658f9502b4cd9622fbf0f3d45a0
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 bc8c56d5e714..77f16900fb38 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,2 +1 @@
 DIST bcpkix-jdk15on-1.50-sources.jar 401716 BLAKE2B 7a656218b96da46027c82a023404c32b92a640aa0ed5a1256213139e8dc54f9ef07453478dcc66372a0a49562b92165148f18a5063c24f7569a3e40f649494ba SHA512 6dc6d63db649a94f54c7739144b4120db4255e0a0a713389d54fcd427b95a3ff5ec326ae066cb5aa8a6cf19ccb959cbb22f9f898d39bfe5bf8e20c4d9de6931c
-DIST bcpkix-jdk15on-1.52-sources.jar 422301 BLAKE2B 10a1b16d0d1f7560ce71f9f99c6efaede73250a1ae298c22396c6ac1eeebe0d51c52f8a6a6b1ff68cfd11ab076d5dc97182fb0accd53e769ef9fa65c6764961c SHA512 55f33846e16f7367a25df0933c904b435933e96d0e881bb949c3e3812618fc0d0b5a2901efa779e02a6f48157231da197e2bf5d8037b22169330fa374b07a988
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 fa8d36b6f2cc..6b24428bb3d4 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,7 +1,4 @@
 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
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 d5ce46f2ac5e..000000000000
--- a/dev-java/cldc-api/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cldc-api-1.1.tar.bz2 142368 BLAKE2B 3f17d5edba61d8caed820a230156485b995985b4bd04e01982bc84de9c28d890e4ba8d30c24c2b1c211d43c666b7e92163c0442a2cfcf1540ac404816145990f SHA512 b2baae07c037692b2e9ef418728817b60c39fcef7bbb2ccdfacb5551aef2022d342458434042154cc4b4f82895a427fab2f277b6269fa651ec3bcdb23a771e7e
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 42ad9a885e53..e170628b3386 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,12 +1,5 @@
-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
+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
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/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 f81c51eef75c..000000000000
--- a/dev-java/tagsoup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tagsoup-1.2.1-src.zip 222757 BLAKE2B 79a43edfa9aed7f08bfaedbe758b2a08d5ff596e268cc415707aee9076bcdbf8de0b4c2a855b9558ff2cf598ed4811a7a690aef6c5004e34484ffe3087bef8e9 SHA512 3bb1608746270663f6ed45318457e3ee27419929411689d962cffc0ab0c32ec4b858020043be46e929014b696c753a01b49d6eea9a98f18d81fb9205e99ac0a1
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/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 afed9eea6216..4e5dadfa8763 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,6 +1,7 @@
 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
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 c89f4740694c..d072a4397b61 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,11 +1,15 @@
 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
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 e96b3c5d9c42..ffe3f74ef21b 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,2 +1,4 @@
 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
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 0b72d2087ee4..59723a5a1d1a 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,2 +1 @@
-DIST nim-1.4.6.tar.xz 4793544 BLAKE2B 5d015193564c63f16bd812eed19ace6cdeb2c944aa3aad3a41f4f811e8d56bdde02c5b405e7939ab09ad8b29d84ef9212c2df7c9f9148e0c26288157d20f4846 SHA512 6b1971a920c3572f9a1997648a297afc1696b09ac20ca031a4b23eba3b66b9ff93606bff2eeacaa651ed8cf6af2df7d38ec6253a4e66955a3e04c6d88991e013
 DIST nim-1.4.8.tar.xz 4786360 BLAKE2B 961b38275c4f9de87ac522c5b47368ce7f5543811a2dfd7b4f3fd79a104bcd0458caaaaab1705f99eb42c64735ca5f71d5018f8a8275a430d883233b28b1d412 SHA512 e6b245271495880f0eea271c46b4f5ce9168a421716a9a22367b6be3c2a9822937aad1f48eb61c151b040ac961728a89c8a6d143c8300057c0d8c1f2d66f3dd3
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 00e3f3ef4967..42bb39b662b2 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,3 +1,5 @@
 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
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/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..8bf7068eda85
--- /dev/null
+++ b/dev-lang/typescript/Manifest
@@ -0,0 +1 @@
+DIST typescript-4.3.2.tgz 10624314 BLAKE2B b980fbabc60e143470d437a93247b874823353b7e7e9691b2a35abdfc2c5323fc7184f9ca8adca5211cebc329eac467900a7a54af8435e8955c8d76903a3f14a SHA512 cd9e214a19e69e8567007a551d6a5373176fedd58feb44b616cc9d40b57c5793db4b71627e3585151887496a4325a865cbcf0f472579b5e4d22e8ab8786ee62b
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 869f79dafbb5..2c6cf25e3be9 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -3,3 +3,4 @@ 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
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/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/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/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/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/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/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/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/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 2d37b2b521b4..a28b17eef20e 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,4 +1 @@
 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
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/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 204663815584..0d08f782683d 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1 +1,2 @@
 DIST nettle-3.7.2.tar.gz 2382309 BLAKE2B 0195f973afd76d33805de4621cd340a041144b24a20ccab03a58749dba82ea12b063f779aeeeb3f063be5e1bb74dec4c8c8f72b3dd01aff033e908a9f534ad01 SHA512 5f6edcc24ff620885b24394b31e55b494418c35dd63e6ece222ddabc58e793c44a82155051cc5759896ed5f014a8efd547f0aef6736a131e41651c5cab7c7211
+DIST nettle-3.7.3.tar.gz 2383985 BLAKE2B 8d8efbbff98fc1f3eff3296681d3d72346e78392f356aebfe80138ae6ae1ebf3695bd7f74b906beef0cf3625ba6d84bdb43c0f6707f54f4d98870d50c90ac9a3 SHA512 9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437
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/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 42ad9a885e53..e170628b3386 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,12 +1,5 @@
-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
+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
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/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 c71941bc8fcf..09a5baf692af 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,3 +1,2 @@
-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
+DIST re2-2021-06-01.tar.gz 403726 BLAKE2B 1919cc564f84073198062dace3c390b14acdea8b6be7b87d7f7548655dc6194b8fd5f0cd27567297ce80ba69b0b5a6bb824a2b9382ef2bd60d3c40bc4e3f412b SHA512 cf18a9b437d07046294ada992693c5af7c560c36a3435e525a36ef542f352d33627fff8903434063795cd124f7e5c0e30ca7eadda847a0fd9f7d97ca207d4b42
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 687f4af6d09a..0ee98d4efa4e 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1 +1 @@
-DIST tree-sitter-0.19.4-r1.tar.gz 2869856 BLAKE2B ae010a66f5fd51175b474e1418d36965cea8ed87edb5d186c9a554cc2a193233046148ffd8f7764b61c166e75eb94866115d948b2a367a5e1140f5d41c9f8505 SHA512 cc6adba489f4bbf3348b24f6d0d4039ae8bd80164d6e6bd5ee313bea064ef978d43aa78f7294601f65a95501b4fa0a914af879fdc362e54f429ca2255f70ae2b
+DIST tree-sitter-0.19.5.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
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 504425a34342..fe03ba6bdc65 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1 +1,2 @@
 DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
+DIST vala-0.52.4.tar.xz 3577796 BLAKE2B 20f541f5429ef52cdcb4b0c5559dc312f62276ac6d91b3ca97f5bce4b954f7d0407637131e16db5a9f059f5ee3e7d44a414cc06311d49c294f22789db821ec79 SHA512 3c7daae4d26e6940b0735cee84f1a25f2aab12c93d2a8a9e9edec45c0c9dc9184cc790acbae19aba0fb31dfd7115afddcf8b9f09b0423b5b6950900641f4c527
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 96bdb1ca0f7f..a88db01e22df 100644
--- a/dev-lua/luasec/Manifest
+++ b/dev-lua/luasec/Manifest
@@ -1,2 +1 @@
 DIST luasec-1.0.1.tar.gz 52370 BLAKE2B 4e90adafc5091fe462f2413f54aae9d3baf699471fad287ee58cc033140587a93e15baddea6fd6bbf7a90378e99f6fa12e63eeecab24d31c91a1ee2f9924df70 SHA512 21ae200e40f13a35eebca95cdac25ae13532a3008b2f9ec97a079033b9efde69e81954354453623eb77340368f482d3c69adb26881a6c0d7c4897df31301af93
-DIST luasec-1.0.tar.gz 52264 BLAKE2B 0537592ec9a33559c233448bee84a5b1b4e84448e89d50adbef75ba9b67c175e8a10739d727991051e48afca9bf78b0b115f70b2a341d25217b5b730a66a690f SHA512 70e81291b71111fb4976477d1c8ddbdaace17f017476b4e74b0ed88498e9e016d4ece1658f7fcce30f21aecab8dcf3734ce620940f61f2c70efb911c09a95bb9
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/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 aaee3c2d0d8a..13da65b08766 100644
--- a/dev-ml/dose3/Manifest
+++ b/dev-ml/dose3/Manifest
@@ -1,2 +1,4 @@
 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
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/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/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/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/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/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/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/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/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/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/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-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-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-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/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-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-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 958c4ff708d4..00800cbb16c6 100644
--- a/dev-perl/File-Slurper/Manifest
+++ b/dev-perl/File-Slurper/Manifest
@@ -1,2 +1 @@
-DIST File-Slurper-0.010.tar.gz 15905 BLAKE2B 92ead775ff7c796c0cfc7631160e7483b9defec4d603e9d5a7f7f3380788f6af2a2463f1c0fa66f21339f8a61651e4e9b48ffc829ba9765158c911df4531ec2b SHA512 a6e2a86d76d2e4c49a8df17a453a3da530cb62324cb91793c4bd6e7cabc4f5b4b4fadda8aa0f98390ac950a94a4b82cb3ec547caaba88bf61ec0aa086e298832
 DIST File-Slurper-0.012.tar.gz 15517 BLAKE2B 07f451e93e5fa8641a4b8156a61b9a9c1a9c9dc36b33c4991e1686e44b37730af3a9541de33396cdec6bac1d08ec1bf9db505e6fa07f3c95187c4901016955a5 SHA512 276b510c85b4e28fff4b8bd77c81031367b073426138743efb5d54fe01fa9825409f86090788779e96625b43207d1f864f348cc11554c51d36868dfed568f2bb
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-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/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/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/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/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/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/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 417748e57dc4..9fe23356f85d 100644
--- a/dev-perl/Gearman/Manifest
+++ b/dev-perl/Gearman/Manifest
@@ -1 +1,2 @@
 DIST Gearman-2.004.009.tar.gz 47063 BLAKE2B 4917d711407231d392844cd37390e0a73dc0a85d2e08584177f0986fa7dc16122d03280baf22a1121ea8478126caa3c68af961e59d007874ba5327736e61d2cf SHA512 4c0ad8dfa8af1200f29b61954efba03fa0d629a40bfea379025b5f01b2f8305394a516680fa7564d68c0231359ed5866daff9278b4350fbdc1a0b20bdb34eeed
+DIST Gearman-2.004.015.tar.gz 48847 BLAKE2B 60613a622c238c4736df6d07dcad714d882f6ef8a83831b18461857d3ae560966fd3ac5ab9bf83ec1dd1fbe994450ae2eb7e4fea5ad44802403bd88d10c325d5 SHA512 020eb3ca55f8ef33f546f60c6cb8c70d2dbbae21f11e0c165443569805040df7b2a0c89bec9de1d3c7733c3edf25bffa8faf69857c29f8b2371b5e06f5b0fd11
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/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/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-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 0c155dba58fc..b675724527c6 100644
--- a/dev-perl/Getopt-Long-Descriptive/Manifest
+++ b/dev-perl/Getopt-Long-Descriptive/Manifest
@@ -1 +1,2 @@
 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
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/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 7623d6819dce..53981c808b07 100644
--- a/dev-perl/Git-Wrapper/Manifest
+++ b/dev-perl/Git-Wrapper/Manifest
@@ -1 +1,2 @@
 DIST Git-Wrapper-0.047.tar.gz 30416 BLAKE2B cfe969bd4d60ec0252cd9d78d753ff3200a8bd1a522617dba5436361817eee969d9310bc40aa68651697c75ead5a6764d4e8b02031dd70d256b2124f0c8d9181 SHA512 9a2c9bf30a9b803170adfeae9bbe41e1b0fc9e67fe477d4fdf1d20a57917c69c1c6be2a90fbc382f85cf83a209b39a9a3431276b33a6e7655b8cd240d1a68e78
+DIST Git-Wrapper-0.048.tar.gz 31531 BLAKE2B 18d74644a0e3d37b60e69a86f70b5a0769627c5dd2b7d1986c960443f4bb7a2f9cc3f1cd3e6bb120c27cfb5bc5e6fc5bcf7a11ece27af7abdbd4cf42914ba3dc SHA512 2dce8cc1c05a321ba31c3c78cfb6e3c793fa3d47d03c459ee559540eb31db71d9c641b4c1dbcd5782d84031a7aaf6024c5b60c2ae71b94d0a7a1f19f9746ec03
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 07c7fda318f4..095fc77b570d 100644
--- a/dev-perl/Glib-Object-Introspection/Manifest
+++ b/dev-perl/Glib-Object-Introspection/Manifest
@@ -1 +1,2 @@
 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
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 b7fad8f65f70..d2bef279cdcf 100644
--- a/dev-perl/GnuPG-Interface/Manifest
+++ b/dev-perl/GnuPG-Interface/Manifest
@@ -1 +1,2 @@
 DIST GnuPG-Interface-0.52.tar.gz 63733 BLAKE2B ce068177b8467356b57aae95a61e4746e4f690272083e465c877533a5ab0eedaaf271586aaffe7e4f979034d04bd49fc483047654426f23cfb904a98326454c3 SHA512 911f47a3b52249e8b39133d4040b86147793d9dd6a78d2b279674d6bba0cd38de5c919bf12b241b0e977790575502531afab6b1d2c05739d050c16d05d52fc49
+DIST GnuPG-Interface-1.02.tar.gz 75523 BLAKE2B 4b1311bbd930ae6719db9d7d25e247804c1f71f29da52b1896086ff4905cfdf09792d85fa9e90da462e974279cc673bacdcd2b6a32171eca1be861df5f712a98 SHA512 ff4365aa75fbcd2dc77c915ec36c0b578219ae1a2148e936b4769221f91c78a3bc3d371159b5130e7bee36ecf0e169b6a16e3a160d2598811d6f70850119f6e4
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 24c43ae344ea..16536eb5f6b9 100644
--- a/dev-perl/Google-Ads-AdWords-Client/Manifest
+++ b/dev-perl/Google-Ads-AdWords-Client/Manifest
@@ -1 +1,2 @@
 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
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 fa5ae58b32d4..e449dc192970 100644
--- a/dev-perl/Graph/Manifest
+++ b/dev-perl/Graph/Manifest
@@ -1 +1,2 @@
 DIST Graph-0.9704.tar.gz 146930 BLAKE2B 38c4be274166f3c3d7443fe75981f4caf44a06eedf8e562e7259c771c47bef4529db2ce980ea8aa250936b898efcb24dbbd9718f37ee57f133ed88cb7de6755b SHA512 1eed5049577112cc2e41a83f6b3b6a22a08170597b5cb89e2eab6cc68386bfd989d3953d7ceab85bcfbd7d097a6925bd8eb43f48eed1ac07469ea4b2432149da
+DIST Graph-0.9721.tar.gz 146928 BLAKE2B 15b5390afbf6e6076daadfc5c3a8d8729ee1322f5a676276d5a3e1b63cfaa379e9d0428431a36d7bd50caf27b62c9e2fb2cbb23faf2806233fad06fa7cf62bfc SHA512 38edc400214c60be475c7b733e769b4bf1fff680eb70b999d46d037cd314d50cc882d8b6547161abe2e765a5c1385166f9b5489d2df1b9a4332acd98eadfbc7e
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 cd600c7c3764..37bfad05fc48 100644
--- a/dev-perl/Graphics-ColorNames/Manifest
+++ b/dev-perl/Graphics-ColorNames/Manifest
@@ -1 +1,2 @@
 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
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/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/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/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 f20a1e12f53e..000000000000
--- a/dev-perl/PortageXS/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST PortageXS-0.02.10.tar.gz 28890 BLAKE2B 66686516b975ff0da641c75dec63c3c6afe9d5bf7762ffb1f4a81c31550e601601f6190fdb992fce0a6e694bed46d4c95f599cf7a20bf0c069493a1e07dec499 SHA512 8f5a6cf8fa415e13401fd7901c81fef42e0cee81b7a9c1f276cce9582c705ac7e2004ec213033fce065f965445342ed0140d8b752d2e857dd40c620ed4af6b1b
-DIST PortageXS-0.2.12.tar.gz 41772 BLAKE2B 81583e73189908cd3b1588e74d5b291d1955995ff1d283682c245264feac7ed9eef4cfcd2ef4497c229f3d007ebd0a8b275d7c7c0e64ea3059dda3bc01eb66d7 SHA512 e833c8dab25ed6fcfad999e4b0bb803d69523ff57fbcd86ea0c29c671889a66c81f0081d6242039788a73d090e3245776d12a8286114b77f72d39514dfe425bf
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 616f9396ff2f..000000000000
--- a/dev-perl/Sane/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Sane-0.05.tar.gz 39417 BLAKE2B a19873adca3254a693c353433ba3d584311f3f39b4ace8ef26c1a42c968597b115b85e15a8b05b9c89194bc94e2363e2f1af153d81d5cad1d12217849f12510b SHA512 03e67ffbc5d89b3e2b9c7d4c0221c1dadfd4f2ea0c33c761f599e1ea953dbbae24d5d78780d8a3e660550105550901b37a4ec67a3ccaf7c56a1b713e1fc69473
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 9feedbee3cc7..098bd6e0e1a7 100644
--- a/dev-perl/Set-Object/Manifest
+++ b/dev-perl/Set-Object/Manifest
@@ -1 +1,2 @@
 DIST Set-Object-1.38.tar.gz 80719 BLAKE2B ff7a42a2fd1f368d58bbc73bf10ea3579c952b49a826e47ac9e7ea3c64a792117fd55b2f52979c51ec8964f2abd9c0f5c2f05211e0c7a407e7f37e91ab3486f7 SHA512 fa0411f543fe1837d7c07a07a99d3b8a3735162fb7b665060870cec8edd40ab39eed74791ce2aa96b9ca04a8e773d810ba979508b03f8d4698e8d844f62bee1a
+DIST Set-Object-1.41.tar.gz 82292 BLAKE2B 84f54851704d0695a59838cdf0b75d010eb8600496842c206ebee9df2f2221401d39df7d1fb35a086fb427b23fc2fcb1debf9e8795bdb7d0c8fb3c62fe7d2112 SHA512 e7e701439c32acaa79c579d373d51db1ed908c2fdd48943910e53fb99578017d06fb3925a3d68c13318267f2940789fc8c775004c2f8a3a06d0b8f03c685fc33
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/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/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/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/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 7364a2dd8137..23a1ecedf5bc 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1,3 +1,4 @@
 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
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/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/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 2b6279977e78..8a69860df0a5 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,2 +1 @@
-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
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/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/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 36363eccbba5..d663054eeb64 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,6 +1,2 @@
-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
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/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/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 d75f114fc9f2..fe3b67070d1a 100644
--- a/dev-python/ansicolor/Manifest
+++ b/dev-python/ansicolor/Manifest
@@ -1,2 +1 @@
-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
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 77363d037bc5..59621915accf 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,2 +1,3 @@
 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
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 00a032d037b1..11113db32bb6 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,2 +1 @@
-DIST argcomplete-1.12.2.tar.gz 53861 BLAKE2B 59a8472818aef4967cb978302bd98b206b206beaf37ac7743b1e3460e3f184e4fe2dccbb48e1b436dfd1127248d3fa2f10ace81ba35c744d93adb5efedd7e470 SHA512 3099507eac285b396df1c02d7e7bdedc1dd26aaf599a81147ebaabe211a97362ddb94533c9bc733d30a9fe84fcb9d6b52794e4c12f99f881b320280d0d1479f0
 DIST argcomplete-1.12.3.tar.gz 76128 BLAKE2B 6924e53af37e4ea614dde4c76f44e5c2b777f8daa8fa8db53d6cbe06f56f2ce3edd11a9baad6fb2571e701fb74e02fbb8eed8ce1067c599fbb156ebd8289cccd SHA512 b302d2b1250b7159177a8491b2595c2166a2b96ac4d98cf45202282541f7da53c9f272ec778133d1734a22a07d490652b9d4c956af727397b2f6767a9a445b63
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 f42a192246b6..5018a6b19280 100644
--- a/dev-python/arpeggio/Manifest
+++ b/dev-python/arpeggio/Manifest
@@ -1,2 +1 @@
-DIST Arpeggio-1.10.0.tar.gz 766416 BLAKE2B 75898c5be536998a12ec0efb8ca0729913e9ac7ac8481f614cb1bfd5332015bd2c22722cc6836511e1b77d933fe497538db1a00804e2cbf409af7cc153ba15c6 SHA512 368c478114ddedbf40c94b4e656945063df5661deacc9c75780ddca18198a9e3e504718fc6c9a1e84c11c5c8f2b454584d1cfc5a14ea2b783e97b8e317047023
 DIST Arpeggio-1.10.2.tar.gz 766747 BLAKE2B 91e828731757b6ca1e16900edca3f45378c5bb05469e1d32571f9185dbb887f5cf6ae54afecf77f352f882d9056a0814c65aabf51424b482ae3a8cb90f11740a SHA512 c6a162f9ab854bac7e2bc9e5d5553c2dbcc068fcf61607149727cd4c8a7c87c63cab765b423c8ea76e09fa81ccc42157d724388a81e22864580ccf734998142a
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/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/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 cefaa26dd376..11e7d42bc6f4 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,4 +1,2 @@
-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
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/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 a69b43f8cca3..c365823bb8e8 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,4 +1 @@
-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
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/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 7722026c356b..6d6433b471a7 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,3 +1 @@
-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
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/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 8e0ba4f675bb..d278745eebbf 100644
--- a/dev-python/aws-xray-sdk-python/Manifest
+++ b/dev-python/aws-xray-sdk-python/Manifest
@@ -1,2 +1 @@
-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
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/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/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/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 3e33ee475229..efcc281218ef 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,2 +1 @@
-DIST bitarray-2.0.1.tar.gz 69368 BLAKE2B 4acc490998e058e3882db2d58ad80b8c275999f49a7a76604091beae8015e7290691f6b34947c3376795b9dc5643592ab7fd09ef5a482a29e4e154616926e444 SHA512 091a0e7b1ddbdb804241eb4f51c9167dcfefb55d5bcef1eaa617ac77593a58113b47f57be83ceed47a91bc5d8d15a8a2e6053a10243323b9f7c0908444ab03af
 DIST bitarray-2.1.0.tar.gz 71169 BLAKE2B 8d82d49ac309605d989d29d492dbb94dd59c633f0987220ed28bbca7d2c3b0c4566ce147d0f65893c5dfaf1c2f702870d95181dfaa969050e13bcd4a9664ef51 SHA512 e91200b8829b63f297a1882fab293ac007991740a739587ba473abce183aa79a85e08db8a0fca5729b6e1d3e130965b2f14dc40acccf12d3231852498e2fb141
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/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/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/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 64ae47d33edd..fef7b9fb0cad 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -9,3 +9,4 @@ 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
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 64628b3caf3b..5da24b7dd10b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -9,3 +9,4 @@ 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
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 15ea7ef7ae78..45a78921e9e0 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1 @@
-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
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/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/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 8bdbd4d7dc7e..761569871846 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,2 +1 @@
-DIST cachetools-4.2.1.tar.gz 24753 BLAKE2B 90345deed94ea6d5ce9c4e3d609ae5a5a8e29f506e559c017fe24e5e8c73e056da4bd4d01e80ccc91686e03ff204e1918375b9701abd8ab571241d09c7556cbb SHA512 bf5a05fc513241f05e61547b5d45813308f20a58319d1c057f3269533a55b739203ba74bc2360d38383cd222a148dcf192f6e58614258bcac2855b633145733c
 DIST cachetools-4.2.2.tar.gz 23682 BLAKE2B 7c1163d216fed3a5258ecb1c6306468d0ace8c629275cfb4f3aa3c4e6d9e2560683ac5504b0ee3439901f1e53b7428e27a78c909f6629d3b006610ec8ef35e98 SHA512 b3aa68cecbd9f20e0ff482c497c5011f4d1bfe4ed106914433c6bcaa203fb29592e056807767efdcea0cf7dbd3a08f3edc9c0ea8b328a1442792f9be2049c860
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/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 6685277d1ba8..036d939cb6a5 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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 e2cb8ff1b9da..574c7ffde71c 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1 +1,2 @@
 DIST cmd2-1.5.0.tar.gz 662624 BLAKE2B ed46c4e70f1e09c612f66333bb601afab0158a899badd2b86ce193f7384c35d32c58d0a1238d5fc2b69adc11a233fba2089b0f4433c7b6159aeb347150128fb2 SHA512 ea7e26370e1f83dc95bd0db8a705ab8ea95935584123f4684e3b8debf23a37fbcadf2bc1634051eaddcaba92f2b22a0ab2582773630fab3d1482b4dc8a23acd6
+DIST cmd2-2.0.1.tar.gz 644705 BLAKE2B 5fa3b89d42252372b1b75863f8c1293182a555e6ab1b257f1a243c87685bd0aa643d2906741636143f7d3aa3be5ffea5f8616c25e99fbb8598573d3d1feada9e SHA512 880c5f2d80f81a850b545052df2bf3efaae8f44deb30186119a2d94277da59cb027da5bf35b2bc106b90c87883c8eec1a869df65988ced1b6a0d0c7e236569bb
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/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/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/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/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/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/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 040fb2950906..f2e0d8e4b2dc 100644
--- a/dev-python/cwcwidth/Manifest
+++ b/dev-python/cwcwidth/Manifest
@@ -1,3 +1 @@
-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
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 f40983ff3ed1..89da8dc6121c 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,3 +1,4 @@
 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
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/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/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/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/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 2964f53552b9..d408f76583e1 100644
--- a/dev-python/django-otp/Manifest
+++ b/dev-python/django-otp/Manifest
@@ -1,5 +1 @@
-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
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/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/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/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/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/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/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/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 c7fd13c0c5dd..f57537cad621 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,2 +1 @@
-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
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/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 00076f3a57be..c571a9b13ca3 100644
--- a/dev-python/fasteners/Manifest
+++ b/dev-python/fasteners/Manifest
@@ -1 +1,2 @@
+DIST fasteners-0.16.1.gh.tar.gz 28572 BLAKE2B 8434f2b47eae01bc3eb239df7adf1106299d76e577724291aef82fca2b68c7a7b5b82fa37a80d1d9ca0315615586c61b29bd4f6ac5cfce6fad798b4423eae64d SHA512 e2f94ad4d19fb425f507236ffa4611127d6254485daef4a818e4508ce935aa7a7100c2bb91343697d6005f4c220d8060fbcba19ca1e2dc257be756b0e24454df
 DIST fasteners-0.16.tar.gz 24824 BLAKE2B 5072c1e0633bcf83ad71176dd7f9e2a2179ce4abdddee4bdcfa28f90d7f617759dc855e7fd91afb8b734d5b455d2597e748c169538780927e4d17c93e829453c SHA512 aac91be8f732bcda238c40317359c7faaad632b26473eff940fef0c6c2c227cd83942122c0ec26da236ca8c19d3024798590244ec761c2d2700ffdc7142533da
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 6ce7bcdbe127..9cb5a91bd84a 100644
--- a/dev-python/fastjsonschema/Manifest
+++ b/dev-python/fastjsonschema/Manifest
@@ -1,2 +1 @@
-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
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/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/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/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/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/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/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/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/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/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/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/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 31179cb72b63..19ba7aceb298 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,6 +1,2 @@
-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
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 f388ea02acac..84e2296515b2 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,2 +1 @@
-DIST fqdn-1.5.0.tar.gz 14630 BLAKE2B 021b4e53c42830a5523964961cde9857bea9eb700cd2030331b05006ec4a8b7e05a9f2330748b0d84531526e17d81ade73fb04e65db381417f2d7f618138f09a SHA512 3940955df50bcd0bbd5cae82f148e9a8ef64b6db84dc867fbfbfbdd661fcc42208a7506f931209347f9115722c00e330fc03c5bdd459cb4a98d0df59af48c492
 DIST fqdn-1.5.1.tar.gz 18334 BLAKE2B 24dfd88a8176e67209350fe20e446cfee848c392795cde09725526a52af0a9adc6908a4eb6d5dd3ad6f8a11546acb6b82a7b2ad591997010dfdd0a1d235f57ae SHA512 d9d7d1bb8798c63973534bf45fb9bc0ab57b1600c6597212129debb97a908140401f5477f33b83ea273e3f9a2a852072110245a09596ab9a58a10be8043c57fc
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/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/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/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/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 984bdc3d6779..f012f658b6b5 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,6 +1,2 @@
-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
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 2aa621f18852..768c1902f01c 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1,2 @@
-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
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/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 2346b04ee79d..f6d350347a7d 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,3 +1,2 @@
-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
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 a483d9fd9913..83d2af410cfa 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,3 +1,2 @@
-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
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 f46500fde601..3962d9846504 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,3 +1,2 @@
-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
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/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/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/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/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/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 e5d30e51729d..0536f2b16c55 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,4 +1,3 @@
-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
+DIST humanize-3.7.1.tar.gz 61846 BLAKE2B 6ed6e35dc15ef08a88cd15211212cbd4194363889ff0dbe4e53d76adb248da948d688e4eddf5a93548497b1e1e02145431e1c157fd26288fc27f2b9b7b2c80b7 SHA512 152ee6030de83be34bdb40908427ca4f1461191ce417faef273b070a1d347a43f4a44182cd0fa79b8935c07d97679205285bbd6fa43352d2d9cada53df5f112f
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 55bca9156656..435e91e3b359 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,6 +3,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
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/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 81dddcfddb70..2e4a055bd571 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -2,3 +2,4 @@ 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
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/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 36de8fa18f15..28edfadf9004 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -3,3 +3,4 @@ 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
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/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 92e8d788149a..b4c99f4b270b 100644
--- a/dev-python/intervaltree/Manifest
+++ b/dev-python/intervaltree/Manifest
@@ -1,2 +1 @@
-DIST intervaltree-3.0.2.tar.gz 30663 BLAKE2B b6d5e7a029e1d1aeec60eaf28c1e40707c655f0eca7ce889a9c0d85a9003ac262c3aa49c396b4c42ebf70bb63157e098addec69050d01ae42a6ba37ea76e1ea5 SHA512 51d6aa302c95c9a573bcf594de390037ec1a6d674061e6a0b4025fa889dfd0187e37bc0331f13d6703340973e4c539aa1349431b14c742de9d2050cbb53d8255
 DIST intervaltree-3.1.0.tar.gz 32861 BLAKE2B 311b7937526495ff0d5d85b4e6a01744d585714c119e6b128ae47740a50234bfe32395728e55c1c9d0670c92b4e815901dbf26c9a83bbe8271875967e9f11f1b SHA512 adb49726912ad6e9cf6c0985b4fb94df91b4ef54aa2eb327186d7f15bc992745d81654d49f1dd2ce95f7173683ba2a072787ef1e8b389cd9b7e23b9ae743906a
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/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/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 f453441dd32f..0184c6ee414a 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,3 +1,2 @@
-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
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/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/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/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/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/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/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/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/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 bdedc0351289..fd95b7f52f33 100644
--- a/dev-python/jsonmerge/Manifest
+++ b/dev-python/jsonmerge/Manifest
@@ -1,2 +1 @@
-DIST jsonmerge-1.6.0.tar.gz 22735 BLAKE2B 92eb9936e982ecbcb963bc88000c32ed884957275ed43fcab5153ea84d49a376b542db77d4413a47f55ff4fa6f7979b12db1187e7d6c335ed2a71d5944f2fce9 SHA512 e75c1915340d29bceded668faf1fd247a902792e58c3a7ee7183ee7b4a2060dcc84d0b91e8d2258fca4383eac32c76f98330f878a9706c2dbbf5c241ee6fa3db
 DIST jsonmerge-1.8.0.tar.gz 26978 BLAKE2B e6aec87f6beee5eddc5d3a89afd15c45d8e8f58aafa98b6556805c1f86a4c8d65d1562230ec06181351480b1aaa881aeb5ef22bd8d39d5b7d5d109ce8b76747f SHA512 a19a37e0e56d647aec095b6a67f04573e0ffd988964a24f5722ae90ab03edf65628d03f0dc9242830cb606052a73821f0f1c790d01830bfafcfdb11698967da3
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/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/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/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/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/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/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 95966f84b840..5cabb935f0fa 100644
--- a/dev-python/lazr-config/Manifest
+++ b/dev-python/lazr-config/Manifest
@@ -1 +1,2 @@
 DIST lazr-config-2.2.2.tar.gz 31957 BLAKE2B 5bfee9ae556e6b4109fa43ca36cc2676fb805dc6b9d9f788224ccd29e7836313affa55dd031496c2a252c5e64b150fd8f21c2934da3699ba95e0968ee8022879 SHA512 3427d2be4b4763238bd8378ec5936d38d0b944074d56f6ada55d0e3f232fe0846630a0ef3900c169b58092d029297d7c937ea4ad349aaa2745ed25b71df9c7a0
+DIST lazr-config-2.2.3.tar.gz 34213 BLAKE2B 029bdec3ac4f937f439f833f51e44a58f4604f337979c9f06695e7a243b2cde0af39a46139af5e88052e8585d2729c1b328df89979c9ff100338ec557e841b71 SHA512 cd8edc29a811b658045f314b2de4317bd750a701c2596d89912948fe0e58bdc39ad3d22cdf34bb7e46658af7ac6d32249e454c35bdcf72bc5053094343cd37bb
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/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/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/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/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 b22cce0b93a6..b00ea8ac97d7 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -2,3 +2,4 @@ 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
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/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/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/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/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/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/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/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/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/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/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/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/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 446cba019f46..d74b66c03f9b 100644
--- a/dev-python/minidb/Manifest
+++ b/dev-python/minidb/Manifest
@@ -1 +1,2 @@
 DIST minidb-2.0.4.tar.gz 14104 BLAKE2B 020996d1e83a84aad26d073b3fcf5161edc1698f0876e499b5dddf88bc5ad776d5203c9dfd49cb9651f66425dad5bf9b3a751940da2cb3f841157af23940ccb8 SHA512 c7f34b20fbfe3300957d1e73a6237850209b55ed08f7d9de1e5dc710fcce8360e359136f8f996aedb38620ae08122e3e1c44922c60db6c16a1d57711d47a8c61
+DIST minidb-2.0.5.tar.gz 11957 BLAKE2B 31b500e420f256988ddaff7271b143f628aea5ebf0abe77125d9ce5143dca3d3d3fb1061c39d325d5df564514b786d751dec90d82fc3310c0f76daf1b4683d02 SHA512 889e678a99c7a5dff5ae7ae2c3540e978f09616384450934f2f16797a3a06c9d863b57eced4b2cde0a4bdfa4923b754e473bde0905c86d948d3bdb81a8e6dbad
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/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 03b6415746c5..bec7d861c8a4 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,2 +1 @@
-DIST mongoengine-0.23.0.tar.gz 322731 BLAKE2B 5aa01b59193fa118d9b9c2110d6ec401090bff768b5b2e5d9c5fea4bcb5ae6714c62d4ff664c3ab24c600d912f90287a8ac77313bc8c50e13c6d191baef69e49 SHA512 9dbc45ebf3d367a829947f404a3979236be7ef0fc39611046e2815b6ab83bdb2ada3db8b6d1f4bec6301677f5b727cc2570bb732050e2ff865da49a5ba63d0aa
 DIST mongoengine-0.23.1.tar.gz 324881 BLAKE2B f6856d432f34c19f9d32aa7fe340c5a09db6976802f5ce320e9722b942f80a1c38a725eab882780104fa379abe212319802f9dd4b405da41454bda84a5d57eb4 SHA512 fcd2ff1df3e2b28bc4cba67cad71a1856e9f94d4d2ecb731a5cce2f1c5e9abc163be37b7db518dfaa54a0ef7f664ac49b621a0554961aa7e13686ff608ef132a
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 87ef267e3627..f6c5f5fb9068 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1 +1,2 @@
 DIST mongomock-3.22.1.tar.gz 121742 BLAKE2B b325fd917f27712d1fdd35564dd27e02a69a417b40c975b447d1d553a170fb45978303b47878e094c6360930b0293f7353552522b54c9228f8083ea88e672510 SHA512 efd8e46986076fb1b6aa2d68d17b136191bcb90408da305a860a99a86ce06c8377ea5f684902761ceb38b5e914b75f7307e9a73477a3297b502241d7517fc143
+DIST mongomock-3.23.0.tar.gz 123705 BLAKE2B d58f867628c8c80e1289c1a86fa910585431b5eca41818201dccd54d5adccb55c35aea41566ab2d483c7040cfcaa4c2afdbaad39fdd901497a0e1db4effd1c11 SHA512 35442f29907bb58693059a33f5941ca557965fe2b0b9b68ab3e4b31f5e2326bb41db8716a089dd18a1a1fdd5523a729b48a85e0caa0daca1bad2790c2ac017a9
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/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/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 4afb2bae4205..4d4279586978 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,2 +1 @@
-DIST nodeenv-1.3.5.tar.gz 32824 BLAKE2B 4f9e2c14562ff9c396142c5980876a97103d9206f796e9d9d1f67f29819a04db0e8ed232eb3f841a1e2efde84e55d6d7213082f6be568d7a6291562c5624a9dc SHA512 c7e9068a220f183a217b15e724aa8197fca8f2234c76eafd230899963b6796e66e151c20c529e6540f7e3c59849bda3860d563b38f5feeff73601043f79cfba0
 DIST nodeenv-1.6.0.tar.gz 35407 BLAKE2B b952fa95787b02353ff01c27a3e4b692c0cb27954e99af4c4aec682c00692bf3e509947ffd378639dcfdcb2d8077e1b2679f56cef7818997a13a31f882251a2a SHA512 abf4fe55ba478570a32ff3bb24fc3c60ba2d100822f8295c4c55c301ccdff2dc2d20ef76990ea3ac203e30db8a1e85f3ef2df671f87c0cf7305cf1aeb788efdd
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/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 24abc85e255c..809f58f57b06 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,3 +1,4 @@
 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
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 062ed0316caf..e7aa2857e374 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1 +1,2 @@
 DIST numexpr-2.7.2.r1.gh.tar.gz 119099 BLAKE2B d424dd89761ecdad3e5a35a5c8b41f089c6eb7c9ca10a4309fb489bb7ab60c0b77863c1675583014265c057e27f3b9584a35e0ac6232044ed5f8b8c32fd330d6 SHA512 d786aeb3597a6b2196e92f364934a0bbc518c7973252c38f1e93c317d55220270b5d61320d7a465c87da979ec68e988b25182d527e0e96aa3a898f20a6997802
+DIST numexpr-2.7.3.tar.gz 114113 BLAKE2B 95dca4fbd3148bbf198f82827a63fac3e9de29f677457f2ad45040e24a38bb05e4e09738efa0cac793970e18bdcd252e2744da96062217fd35b4054b10112989 SHA512 8234a65ce96ea0a2f20cce7dce3de652362a9edc86af2e7a333cdd8ecd87866f75970859ff39b04d529acc062b806cc8c64f262c318edd2897200d7e54b429e7
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/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/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 cc0ac3b7f930..2d96592bd0aa 100644
--- a/dev-python/ovs/Manifest
+++ b/dev-python/ovs/Manifest
@@ -1 +1,2 @@
 DIST ovs-2.13.0.tar.gz 100450 BLAKE2B 943486bf0aad0e8e9eac96c85aeccb32fd36c60689623acc76175eafc286f4689142d6ea6953224e0a4ea8e4437c56738cb5b113286114de0898bf783cd49668 SHA512 7ec8980257ae87d24dbabc5900cf81253490bcfa0431f96b79280603da04a972fc536055bf532d2b251e03e007b49b34e8118b0f323e5fee05c116824d68562c
+DIST ovs-2.13.3.tar.gz 102736 BLAKE2B ee6f10a41bf46534d3963360a63a0a39a7ffbed6de468894c566c7dd2ee0c645cf6f8f211bfbcda70f03b4204e396fc0b081f457df9d27f93fc40d158bb641b8 SHA512 9f73dc383f7b717000d6d1f8f2f9114ee2be2457c9b352de68c01c1f9075c39ab4a9ef14fe67083bf1da1872240204eb2642fbf7b5a871a5ad044191e0774d88
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/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/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/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/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 cb9ef7dc5cb5..1e6f84d6f3a0 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,2 +1 @@
-DIST pbr-5.5.1.tar.gz 117488 BLAKE2B 52deecc6107d739daec0b2d3c397285c87c63bb3d2a2abc8266feec78d43eff84f4093b9739e2bbdf47b604a1621e4ed809a689b2167e6ea673418bd27f29018 SHA512 c72c2bb8bedd7f0606880f003dffa0ed585521b698e3e986ed2913cd74303e281fbb2374cc1a00b76777c677eb2677507eed9ccaafefceee0a689cb6fa61bab6
 DIST pbr-5.6.0.tar.gz 125220 BLAKE2B fc26737857195b0dbe16ecbcbc6e389b53a61105b3bc66e714bb4fcb4907e4329ee7c76b5748fa7d892bf231522e6ff9d414328ae0d97e6262b608c44c737764 SHA512 1dca9020a84e3b9be71fa07e2feb37bbdb2bb69d0b4f69fdcee0fc3c7fe4d84ac2e2079d6bd7560192833f069ca6f5dc27d03a3ef87c168eed18eee8579647fc
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/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/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/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 4b1e01eac770..be4877712a9c 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1,4 @@
 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
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/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/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/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 bec41d4828b0..e8e94375fb3b 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,2 +1 @@
-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
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 42ad9a885e53..e170628b3386 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,12 +1,5 @@
-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
+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
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 abaa199fdf7a..9cbac03fe9cd 100644
--- a/dev-python/pulsectl/Manifest
+++ b/dev-python/pulsectl/Manifest
@@ -1,2 +1,2 @@
-DIST pulsectl-21.5.14.tar.gz 41357 BLAKE2B e88953b07b49de2e33762bb85e4bcb2a4e5555970127e6395e3374094dc1c87627f2bd4779ac9fb79c5ccc531c23ea76ead4dca7317313881ed495aeae9b17ee SHA512 b9a9ffa33c31281c6d0dc3084cbdc342b2d45cac713a1d928e106162fa412d80718c8f6443369b67b6c6af9d6b2dc6dbfb85d137ae693ab916ac08e19f048ba1
 DIST pulsectl-21.5.17.tar.gz 41487 BLAKE2B d4e547a140a9843107bac70a0a98ab230018b6457875b395528c3c1c1e7f20df4c4e6db569334c98f62be549930ab8e8f07927a54396554f1aaabc9a6eb46d7a SHA512 fdfceea8833955880326c04c536e6b2d63a260a851b98d7a76bb3637f30f414c2b2f4bd50c493f86edde76983e0a0f83c39839fa39646d8f1f2a4e93229d42fe
+DIST pulsectl-21.5.18.tar.gz 41636 BLAKE2B 1949f14c12a9d39f2ef6db798c7e8c8ca6dfb4fd3a3825af9f165e03fe1a3b2650bf369a4dc031528974db594740c0d990ebbb20d54aaa5c79a8859b9bcb605c SHA512 33dd4ca0daac4be1af510f6b4ac102f5b4b555bf2c72a446b2b498a80f972e4a970953812fd06ecf1e780bcfb61037e5a1245a8a047a592d73a7f4bd14790033
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/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/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/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 570503453ee5..3bfe9590c280 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -1,2 +1 @@
-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
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/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/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 b3c1658b21d9..af3e43579ef1 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -1,2 +1 @@
-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
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/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/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/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/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 46e821ec32dd..0cb16f29f837 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1 +1,2 @@
 DIST pyfakefs-4.4.0.tar.gz 196236 BLAKE2B d19fb44320d9c7eab1e97ee4123da548f1e3b2f8f6b0e3be762b6228677fa165ed1b60364481c53f54e79e50a2f98d298e7ff6e65f40aa9c4e372a0f72e19d52 SHA512 774e5e213ee8ce17759cdeaa4ce1d70c43df25f0885c73c7e8aa923973a43f48d9fb19d45105a6a5c5d1c6a0c54c22fe4d80ec3ec92ac7cd97c50fb532af90bc
+DIST pyfakefs-4.5.0.tar.gz 198107 BLAKE2B ee055ba5e5b53fc91cfb83a29b6fe77f6ea89576c1f3f13e46cd71ddcfe81630f3639000de1ca14bd9a56bcf4a09046fce313f65722327b63098142e5c0030cf SHA512 24a4555b197d089c2a039354f693748415035a587d0194d7d6494b83b507db2dd7e34f748fccb18f151b2673f06ce290fab02f6eb56d2691d5ab72ac12b2b233
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/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 da34d5d7f0a1..1a0981775453 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,2 +1 @@
-DIST Pygments-2.8.1.tar.gz 4000119 BLAKE2B d88a3a3b4626a33c375b85ec076120e3561d1719ce45f9f85595bf87f7e813416be934f7ea0022fbfbf1a8ba3f2be1c76f693ab9ece5325fe527a4922cf46318 SHA512 223835c78615207ad590d364ba9a0f4bc9b5815baa080e60b9b71ce7b8e1ebfcc7a292d2a2b1cd358c08d820fc89e02c4060876d37ee17fd9e2759c9a0dcc80c
 DIST Pygments-2.9.0.tar.gz 4048049 BLAKE2B 3531aa35d875296694dcfea267c3922c94d73959de82a34329b7582b35c8b76310cfd364bf22066be5251ee61bff996e44d8c8ca82e9e34af879f3f2ba734120 SHA512 60a8b38e9ea941e4f10d1c4a547be81b8545202d11e2162c6aec0f95014a5c2f718adab8780017be7f49e1f220f731d57ec26dadbd543bfd6a8a7d016c01d772
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/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 499db433da76..2ef30466de3c 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1,3 +1,2 @@
 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
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/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 700dd4feb9c7..e6dcc583dfb7 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,2 +1 @@
-DIST pylast-4.2.0.tar.gz 39761 BLAKE2B 35ab18928b2761255a25e2b8549fe852f28f04057c9fb1075fa223333d079c07340ea17d425695d17c0ec99d67e6e31ed93f6fe60df1121ae7c298cca99b1b03 SHA512 9c8c0eea0d3f54514ba06ad7da0868844f8dc53715717decb3b56772093e637673deb22ee4277e508d7e659b48c79733514c67c9af0283e8aa0032caeae3d44f
 DIST pylast-4.2.1.tar.gz 39787 BLAKE2B 1f2f06671ce38bd42f7297279a58f674c3af8f66de4fe804d90e3fc178c73f09a24f65bbc4fd534da0c04f593dc5eb31f03da38a4ca969ea31a04978a603b7b4 SHA512 c1418ff1e6b6ab905d790cc83eb1a4b3172c0c28d523c2bbd641523a2e2601a84aff126dafd047f0fb9b82744bca883648e197b273026611f47671d39afd4fc6
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/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 1f76320c75ed..95131704246a 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1 @@
-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
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 2dc576125c41..a35ed3557d9d 100644
--- a/dev-python/pyls-black/Manifest
+++ b/dev-python/pyls-black/Manifest
@@ -1 +1,2 @@
 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
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 dd77a476b610..66678bbe66f2 100644
--- a/dev-python/pymdown-lexers/Manifest
+++ b/dev-python/pymdown-lexers/Manifest
@@ -1,2 +1 @@
-DIST pymdown-lexers-0_pre20180905.tar.gz 2596 BLAKE2B ff08ac12fbb242ab5b51b80f91d18281cf8cd9bf121b1a6d389ef47a069c614991d6fb99ff05cca9802e68b4dfc2c89d9f6d4b02051a133968ab9ee24943756b SHA512 d0a509cdd9924053b79259b873ec3a3671869b37f7a97112370d21c360f6315961d13610cf08a00e10f58d5e25ac360b3844fc997392dfe724ec14f02a079596
 DIST pymdown-lexers-0_pre20210308.tar.gz 2962 BLAKE2B 6504974327727cf49c9a6584cf06dee1505c8e0266241b584f84c3a99f6e8344e3dafda2bcdd3773d06e634a6d6aecd1279b40f3126ffdddb77f3218a1a18034 SHA512 08beadf0ee24bc33b6eb231d297bdbb084954fba4a22fb0beed3bb08c2e188bf984465a61138affbcdbf843831bbd7d2f2d26c798c60048145a42d365ae81dd3
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/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/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/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/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/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 d08a1ce9c5c2..78b4df97eefd 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1 +1 @@
-DIST pyphen-0.10.0.tar.gz 1894118 BLAKE2B c33283d6eb3dd7affb52b91826fa0f8fab8ec8f858158e905e8487dc2ad8c77a88e4b25699ed6272d246bcf8a926560e18ec224f59703452ea1ad5c921e4fb4b SHA512 b6d789ca6eb010c1c79b28a9a0e68620ea5600adc43111bed5dbda3cb8b3a4c8c05caa3fb44ea60b0ef4a20272f17cf5e6fe61f0d1e48038395407ff53da7a92
+DIST Pyphen-0.10.0.tar.gz 1894118 BLAKE2B c33283d6eb3dd7affb52b91826fa0f8fab8ec8f858158e905e8487dc2ad8c77a88e4b25699ed6272d246bcf8a926560e18ec224f59703452ea1ad5c921e4fb4b SHA512 b6d789ca6eb010c1c79b28a9a0e68620ea5600adc43111bed5dbda3cb8b3a4c8c05caa3fb44ea60b0ef4a20272f17cf5e6fe61f0d1e48038395407ff53da7a92
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/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 1244c4ba7055..c05c153f9057 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -1,3 +1 @@
-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
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 15c6c8683df4..4357596288ec 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1 +1,2 @@
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
+DIST pytest-qt-4.0.0.tar.gz 113333 BLAKE2B 69c2c8c823b55c44150c7beb0754e90866c7659912dbc0d99ee29904b0a20eadf26939709a5d120d0b95e23bcb99310415932e87934ae84571c55e3ffd07c284 SHA512 cfdde2e82b42979313d96f9a14bdafea0d4d5d5b64b4785ac73b74e36bfb892ab7b5ec6eb1c4e540ec00ccec6739e8bd9a3ffb610f204f6cfe97061f57a3971a
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 ae276597402d..000000000000
--- a/dev-python/pytest-testmon/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pytest-testmon-1.0.3.tar.gz 44160 BLAKE2B a5b623afca30b8c03902a37c8ea56680691cf6a66979e3e3ecb00977f467e5b497ec58f2ddffa8d6993aa69d5c8614a342c7b52929193f0e7694b87671a94fd3 SHA512 1107836272517a390a3cc30d550ac3ebd2cf589430059d03b5c85a1db86276ce73044663c3bfc000e7d5805fc26d716bb26e17081ac2a46b799117fdc14a4df9
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/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/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 d525693d5baf..3277af54aaaa 100644
--- a/dev-python/python-jose/Manifest
+++ b/dev-python/python-jose/Manifest
@@ -1 +1,2 @@
 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
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/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/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/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/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 e2385448eac0..b6d307713919 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,4 +1,3 @@
-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
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/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/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/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/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/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/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/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/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/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 98e267657310..c412fb5377df 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,2 +1 @@
-DIST qtconsole-5.0.3.tar.gz 428599 BLAKE2B 3110d597fe8692d46ac64c8f058f96356be62b95e74ebba8476eae148a9aa51193da0fe67fecf8a2de90d280121367802866bf17f68c7ad5b52ce3f84914af82 SHA512 efe88c66a508eac4ed14efb698b99d80b1a292e4b90fb04f76be829e95cf12b36e3afd968a6c7203bdd077a8bedbf7207c3a717809aaa3a514dfd99f7d4d5dcb
 DIST qtconsole-5.1.0.tar.gz 428856 BLAKE2B 4176c8add4fb949a82ce33fe9df598d2141c42dfa9ce57ae09ea201398df6ea54e00b890ad2b548b51e95f4dc0c7b2793640ced9b39b7adea910e3d2b90ec900 SHA512 50d2f1466d1fd5ebd33da1778f8271c5a328a61551f665e488c5c45326fabb4b431090d89b39c130a064b3c117cd24dc92e160c68c1eecf6647f2b662b01b2db
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/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 162c11a01ad7..94cf26f77954 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1,3 +1 @@
-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
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/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/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/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/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/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 31aff9002aee..01307336593a 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -3,3 +3,4 @@ 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
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 ca5493fbc992..7cd4619f269e 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,5 +1,2 @@
-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
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/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/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/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/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/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/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/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/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/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/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/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/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 7a1bc440fffa..0d8d418e125d 100644
--- a/dev-python/simpy/Manifest
+++ b/dev-python/simpy/Manifest
@@ -1 +1,2 @@
 DIST simpy-3.0.13.tar.gz 410773 BLAKE2B 3769782806b4c68554810cc44a5e59e6dbba2fda86a57b225c9c73d62dfe434a55dc1bc16727d0866684b8f43ea69a50bea96dcdc2109a491dd887d9973a51e9 SHA512 7961cb519ec3ad92fddd16204b1741132371c9b9989a9bc9905227fc50ee8baf3c8bbfd65fc12165cb58653114c26179cb3fbe4d09b082062a4180f09d40a259
+DIST simpy-4.0.1.tar.gz 410082 BLAKE2B 09c6f29d2792ac15bb4a3b42a1cdbd4d342aca0ef528aadbe37e01342534645939c9663977230ec7f6f1542a4354925e25f0c5b3bf6e20b29b6da2e69f3d5a90 SHA512 5cc4baada79503e3c2f2425b9f7f00d68f263283ff0cae048fba86665c4dcf70590683f6b7df50d1c1a914ac7cb471ed4b6850676030bea4a3a70fb40eb2cdb4
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 2c93586d43ea..3b56dd088a00 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,2 +1 @@
-DIST six-1.15.0.tar.gz 33917 BLAKE2B 57e852b6c35dd19e256814c0371cfbc26141b0f25a31f79a1cbd1b0cdd7d3cacf1236b96f5452f968cc426e6dff4d1ad70a9f2432bc361ba3c8c17fd40fe7582 SHA512 eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9
 DIST six-1.16.0.tar.gz 34041 BLAKE2B 764f8da9a0d89e95af002c79c2b19e852fdec9a6819655c57be019b48bd65a5f7909473e71887e6080073f381f983c077487591d4e44297542cf6b9a29ba42b8 SHA512 076fe31c8f03b0b52ff44346759c7dc8317da0972403b84dfe5898179f55acdba6c78827e0f8a53ff20afe8b76432c6fe0d655a75c24259d9acbaa4d9e8015c0
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/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/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/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/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/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/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/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/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/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 99c4ac48d780..4a10883128ad 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -1,4 +1,3 @@
-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
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/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/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/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/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/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/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 1d2a565877af..d45724a9cd9a 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,2 +1 @@
-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
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/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/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/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/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 11a4946a340b..4d4e137ea6a0 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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/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/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/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/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 f220f98005e6..43d99b2da3df 100644
--- a/dev-python/tld/Manifest
+++ b/dev-python/tld/Manifest
@@ -1,3 +1,4 @@
 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
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/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 1865b4af5f74..4f37b818d4cf 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,2 +1 @@
-DIST tox-3.23.0.tar.gz 303091 BLAKE2B 609e74ea354ca5daf45c848000961782fcef59da07f815292355d72f3e5dd078e3b5909a65521a4a1032fa2bb9481fdab0e620f4882b33aa377de9764296761c SHA512 fb96cbbdbd36399036d348716f1181285184985922e0dc61b610b36e53ea79e2d8a77190aad893650bcba86ef4c57ff0f2de2813becb2a12fe0d1aa36bb27ad3
 DIST tox-3.23.1.tar.gz 303896 BLAKE2B d59160035a6412a69f9434bfb5b2b27aa9a2ebd5344b4898b677dac15dc91ab94feca67b8edde4c0ba68c8a6a12fa885091d82a088439257e9393a99e77ade88 SHA512 ec5daf106287b265d1abec8465df8ad053ecf59876038a7cb419a57e22373809e50f8131736762dc485f559363b1878abb49d909e7b6952b2e49eea77c193281
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 86cb3fc0fc64..3c3dcbd9addf 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,2 +1 @@
 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
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 6d7f8ad9d681..71065f45dee1 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,3 +1,7 @@
 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
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 dbf008ed153f..93a394d59e47 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,2 +1 @@
 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
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/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/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/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/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/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/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/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/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/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 97e892f989a1..9fb413204351 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,4 +1,2 @@
 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
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/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/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/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/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/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/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/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/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 480d1039a078..de1ab1ca6aff 100644
--- a/dev-python/xxhash/Manifest
+++ b/dev-python/xxhash/Manifest
@@ -1,2 +1 @@
-DIST xxhash-2.0.0.tar.gz 64099 BLAKE2B bf4a013b70f02945b00b01043b34ff32bda0ce8aac5a533a0c7c606665a4054f443a46b1f60454b4d19a064db276ea66370a159d4037df49d5213dfc33703421 SHA512 c0d303f2705542ef8edb78ccccf42e3da6904e81cecb52f45861d0f0215f0882ad1617167273781c19bb5ff7ed776ec41a36a380eab2ce59e02636fc76f4b009
 DIST xxhash-2.0.2.tar.gz 64283 BLAKE2B 01fe9868b45f0be762c233a80b550e4069bd7f259fac8aeb90407864ac1fa6cda314880c87ce03d8854bedbecea1eba665ec4e00b27b68a8573c398238c5ce97 SHA512 8908e78207ff7b835259e359e2617f6b96555bd9dbc5bb079c850e9de22fd33c15396fbde0cd824cf8af2a195217f3ddc1aa8e62f1ed4071408b4a29bab31f2c
diff --git a/dev-python/xxhash/xxhash-2.0.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/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/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/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 632a025e172a..3c80995934d8 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,2 +1 @@
-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
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/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/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 5a7d7a6d38e6..b6a42c6bee97 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,8 +1,3 @@
-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
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 4ab5874e30dd..7b8cef23b1e4 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,6 +1,2 @@
-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
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 5a7d7a6d38e6..b6a42c6bee97 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,8 +1,3 @@
-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
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 5a7d7a6d38e6..b6a42c6bee97 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,8 +1,3 @@
-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
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 4ab5874e30dd..7b8cef23b1e4 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,6 +1,2 @@
-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
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 5a7d7a6d38e6..b6a42c6bee97 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,8 +1,3 @@
-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
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 5a7d7a6d38e6..b6a42c6bee97 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,8 +1,3 @@
-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
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 5a7d7a6d38e6..b6a42c6bee97 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,8 +1,3 @@
-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
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 5a7d7a6d38e6..b6a42c6bee97 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,8 +1,3 @@
-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
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 5a7d7a6d38e6..b6a42c6bee97 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,8 +1,3 @@
-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
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 5a7d7a6d38e6..b6a42c6bee97 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,8 +1,3 @@
-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
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 63f34033db87..5d1d6b5ca688 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -4,3 +4,4 @@ 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
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/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/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 a209e0c73cd4..04ae057e8112 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,4 +1,4 @@
+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
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 dd2efb5eeee3..9ec8e80892a0 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,2 +1,3 @@
 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
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 bdf2b94e3deb..8e4391bd7306 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,8 +1,3 @@
-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
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 5a7d7a6d38e6..b6a42c6bee97 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,8 +1,3 @@
-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
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 d0222c4c2865..f9a45c36cc6f 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1,7 +1,3 @@
 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
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 07c13e321804..c68c6d850080 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1,3 +1,2 @@
-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
+DIST ruby-prof-1.4.3.tgz 232032 BLAKE2B 68df149718869afac89b2240263cd3dd48c28b592f32cd7bc8a918b67de7a10abc3a1af04cb00eeaec9e6f7292e5258d22ba8bec0243361289add943535ffe39 SHA512 fd19d97b88b52c07331bf885c69215267eccb3a0519eb3bb6cd6e5907af55ebbace32f3bdef5b1f340bc3c4779666d7f4100878e647fdfde4da3a4df2a946ebe
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 6b4b41e2ba91..2d6a7339a9c3 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,3 +1,4 @@
 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
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 30aeadcbad3f..d55ceba045f7 100644
--- a/dev-ruby/sassc/Manifest
+++ b/dev-ruby/sassc/Manifest
@@ -1 +1,2 @@
 DIST sassc-2.2.1.gem 302080 BLAKE2B 626601d2b22f91f354a4ddf7a68e4463b0a56b0a79e5d2ca122a083101146dac32699e348fd4573ef4ba76a430470ecd39427a8542caec931a8e16b26a23bb70 SHA512 728ad274363fd79aedee74fb6d4dbfc60f31b334e1a8054943ccf9cfa534fa3465abb00a2bd3020e198d287327058890411bb1983da6dc5dc3c4413b1936e2eb
+DIST sassc-2.4.0.gem 304640 BLAKE2B a4cd96859855cfd26e78a35becba30af8b7ee52d8ba67f7dcbc6354786f26e60a312be4e773f515f6edda6623142249a4a470f418d9fae3db734f8ae11498dc8 SHA512 835ba03d0fc5a791b2d620367f63202973f778bd8ebaa87c27f6a1de75b5895270205e8746fbb242d2739c9830a27d72453a75c1b536090840de581c52caade6
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 a23f98ee5f6b..8d0854a04992 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -5,3 +5,4 @@ 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
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 cf779b8df2eb..4af2e0d70091 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -4,3 +4,4 @@ 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
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/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 5bf18fbb21f5..d5012f46efc1 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -1,4 +1,4 @@
 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
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 07f4962e932e..2f6afc2a104f 100644
--- a/dev-util/bear/Manifest
+++ b/dev-util/bear/Manifest
@@ -1,2 +1,3 @@
 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
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 7ab01f69034d..0afffd08fbc8 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,3 +1,2 @@
 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
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 d9de95884c5f..5b1e39de2d1a 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1 +1,2 @@
 DIST catalyst-3.0.17.tar.bz2 621403 BLAKE2B 210bc38d036e04282732179b37e018ac12ac17f83517fc41198ee1bb1ce9ef8481e791eb38d0b13aa1f7edccb7fa6b57403a433c7db7063854ac2227b64f3c39 SHA512 636ebcd137b53f2cc3a80daf3ce79d218eeec2e4e44f8980df9d1b1365c4218e096c84359262d87e0096ba35370e37d973f8b35071a36823c46bd859d096991d
+DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
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 6120f947881e..f290b9281428 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1 +1,2 @@
 DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1a5293330b8162da0f31895b0c3a58a4e0f36d66bee3da328a6b0a59fb5bd917a2f3f6fcf7772a4c63db5cd0030caae SHA512 15cc145f143b4cac6e78b12e1c29e191d0c1c96b0187db05a4c8aac18310a5cb31d912073674ef4c01727c9b5a3b67f8c508842cb625db338b4034faa52a4a4c
+DIST cookiecutter-1.7.3.tar.gz 253444 BLAKE2B 92ae74768c909ab8e2ae97ad87921ae0cbf24c417ab6985ac10eacd913981ee7756843e2588936174d3c04ecfa7a62077a6d4a323fdfa6d1872f3c84d943cbcb SHA512 a7dd7993ba40a084a719d553afbb8035f26976f38a3e8ee373c8074db64eac6bd7b711eca8cedbfd1050fc057a0b45409af4d59ff3bde57b344317dbee56f10b
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 9ea2bdf860eb..d01e2bb2098b 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,3 +1,2 @@
 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
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 7cef42b2c8c6..7bc6a73b4183 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,2 +1,2 @@
-DIST diffoscope-175.tar.gz 1590841 BLAKE2B 86d6c910c60d1d472a7131cde8b5b506901ee0a838e96105194d1a8da167203a204c81076ccb06a47401338a90a0f7f49dabd13aa9ef100e88759336051e6b2a SHA512 950e5539a2d2242619426cbc3790a50f30119df2bbe36e5a03c63a9e01c741a0c529b0bd25439723064758c4c32cfcc621f67f7e0e0867071bdc47a7844ab097
 DIST diffoscope-176.tar.gz 1590912 BLAKE2B aac3ac90e4dfc23aa137cf69c6323419bdf29e9b9212b0aec9cd77c2325cb97c2f2e9a752dbe1171e7d6bf36999d45a9eff52e43735ede496575b05b5bbf7b87 SHA512 3e91dd69eb485f8b5005af91f7cffa7c05c08cfdc786af4fb6cbca4a79332b3e59c3faf98e34729ce2f231ca44161f002d93ea50b7c2ab2fa2ebde182c37b829
+DIST diffoscope-177.tar.gz 1590984 BLAKE2B 94daf9528c8fd0ad6ed89bdbee7b21352bf33dcef2ae7e526ea3b1036d92b6fecefcb0da46b7eedf7af1c8bd7995e73b8f0a5104c02f4db534f7bcc465c803aa SHA512 674a5cc364927437a79420b0965eb6958bd09df58a1238ea4d953bb2bc0fbdde75e42817370dd3cdab0bcc59551e1cff70db72298087af551d5dfaee57995811
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/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 b68e7219d417..e3ee7bec851b 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,2 +1,3 @@
 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
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 55a7abe50bdc..fb73dc1642d4 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,2 +1 @@
 DIST howdoi-2.0.15.tar.gz 27545 BLAKE2B 204d7e3ddab07e24ccc08964c3880477743970502423887a2360079606c832b93d1e8fbcec237b77533c2e21d4a35af08b9418d5ce62f8b2ceca70ee844c21ff SHA512 e0b3faf1cde78d35a23e11070b3d73db7468bfe79ec8f71b2370681d3dea1bcf1a313594fd1e4f21aa62035460e5c31509ff683fea3e0e35e9412b173ad874bb
-DIST howdoi-2.0.7.tar.gz 25167 BLAKE2B 5923aaae6d6aaee4da7e02cd283d6e794c31d600d2834d1354e0d90194ac573d80140517ba7289bbf97b01923b6ed8c9c2ab6abe0beea0534fc41ecf24196c24 SHA512 9f8278e6ea688c40fee5227aa23375cb7dc7339d579953c73dbf7111087550ece412e26508e129f377e2326ce4635c38d96ad99f98c8c6f1131a01bbaf062275
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 5de8654055be..000000000000
--- a/dev-util/jarwizard/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jarwizard_250_src.zip 169540 BLAKE2B b4fe55b2f9ef8e1ed05a2823b9a2fa5849f241b7a41f921aecb2aad43297e1d2a47fc1a33897813e8078d438b11a16b5c7242a1acbef4e08c8cb82d03ab04a5c SHA512 8d40cecd339e8e50b58c2c78a3c53b712275d95393d8ace4799b55a7f66f6e2a4bfd3348f92d6022d1d48c6edf17117c2b1bb1defc55e73fbdcf541907eeef1f
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/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 116043e7ea7c..6d1ca78ca1f8 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1 +1,2 @@
 DIST poke-1.2.tar.gz 6772669 BLAKE2B 9b3c8c425145be7c93c32f7931f7aba04ae3704920603f8301b8af31cce49ae12c83a697e74f7cec803508bfd165b7bbb1c5a859ce95a791d291528c31b24245 SHA512 70a4b8749ca53e255df76ca32cc401ba58d5bea2ee1c01730dadfb1d76a6c286f44137805c801e0f1e520c59306568a87efe56d44175ec0510954f97b640d331
+DIST poke-1.3.tar.gz 6703563 BLAKE2B 7a1127d668b094f08d88fbbe1650a4604d91e4417e8bf7e1199757b6a829694d514493e1b71eb86fc56e894eec8f0ec2255784b76a3f3440af1f1671d851751f SHA512 74749c589daf17533807248febc54818445df193f4d25f665ab62f1c57be133c7f063da3b099b8af5544f88eecad79b10ca29d9d1ef18921035c0aa22e563773
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 dda473a6264d..96c1183830c4 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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 0af7bddcac0e..42a4802cbe1c 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -1,2 +1,3 @@
 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
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 833ac9628388..26ead59a5329 100644
--- a/dev-util/sysprof-common/Manifest
+++ b/dev-util/sysprof-common/Manifest
@@ -1 +1,2 @@
 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
+DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
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 833ac9628388..26ead59a5329 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1 +1,2 @@
 DIST sysprof-3.38.1.tar.xz 458572 BLAKE2B 68c219a6c80ed070314fc7718a2995c49821cc7c761b277fdd29c233da9d81b561b6c68cd0d0a42cc3e4c150e3de438322f7d418140ce19f3381f4ffac78aa1a SHA512 7ba3dd51bd4055dcdf4d46ff87e46537afe42ba009809fdee5ba0ebcdf70776d9e1ff812714096d33b09ac57d459707b92b1ca07682e2f3888b612ca74820442
+DIST sysprof-3.40.1.tar.xz 468320 BLAKE2B fcba3b627ea32c38e621046027fced7478b6c57ba5487834d35fdde45a38bf4df66e5d696e93627217fa237978a6e7074b9e92ae89f963db7b6fca4482b59053 SHA512 ad07fd21066dfa6c7be81acdb720d97f392e1bbd05e71dd45d743b10a631b2b2c4c1177086f28e7f500271add79aa3356dd2aebdb97604357c4fef43809ead87
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/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/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 95efe7f29693..43a301998fc1 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -3,16 +3,16 @@ 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
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 1035a61e6a85..4c5faf86dd23 100644
--- a/dev-vcs/hg-git/Manifest
+++ b/dev-vcs/hg-git/Manifest
@@ -1,2 +1,3 @@
+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
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/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 5861184ea4d0..40dd9a0c1c3e 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,3 +1,3 @@
 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
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/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 fd28218cd55d..b6e630605161 100644
--- a/games-emulation/openmsx/Manifest
+++ b/games-emulation/openmsx/Manifest
@@ -1 +1,2 @@
 DIST openmsx-16.0.tar.gz 3997584 BLAKE2B 040bb3f6ff0338740b5212aae21db2c97fcee0e8c8ada1bc84a59d94b1b72180c4b2d5eff8cc4ae84dd95bc77f121e15c2f818f1f2e05ba7dc4781b63770db38 SHA512 a06ec56a8a768356b628e59e587ec85898643b04379da5c72bbbd8e48a0533da34a451b7e4d2a2f540f14e6bbcf833534a1bdac9014ce0c35dfd4ca179618f48
+DIST openmsx-17.0.tar.gz 4045461 BLAKE2B 46c70ce3f853aecebf8bdeddc5786903634d88d013497383490d79b0dbf455f48a70b3658b9913db197cf7e66cbc6f4da37da58b1b24d77c75b731e842c663df SHA512 4fc87efd2bfbcd12bebb4e005b18b1cb2048f5d8f3188ef9b55f1e003c8d021fb47bd67d647137daa6a8640b5656b0db363f3b62158d690ddb5f7bf1af3459e1
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/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 e34227e6aee9..63eb7a3b41d2 100644
--- a/games-fps/quakeforge/Manifest
+++ b/games-fps/quakeforge/Manifest
@@ -1 +1 @@
-DIST quakeforge-0.7.2.tar.bz2 2887823 BLAKE2B 27526b0e5491cc9a052f70c387c46b0d5518c0d63264f799cac81e471a87b978c9edcf22f4a68db25b8c05b7b51371504459e8ba5de450719e92aae712940cc7 SHA512 d296e10b86466aee0a4be527a5fea7a44bae60ebef52ad86381744dc96e2bed2ad14d3b790b4514a5c59ac897662e91b80a9d49c822910930742a1d2b8a2ec55
+DIST quakeforge-0.7.2_p20210601.tar.gz 3140318 BLAKE2B 4359c2e92a52bc314bca82dcf6f90aebe2fb7260e9c2e1444d3ca239c53adf1ca912093c5c0ccacb4cf9375e199c244f1b8787196c2f8f3bbc7eb00962b0d8da SHA512 a27e4317b3c01f129f1f32209c02b86abf7148c3e0b2e39306324d6b4758d9165883c169ebfde03fc7350b499088cd685991483911b5ae57ccb9b80baaefa733
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 89f01235014d..2f2805d7173d 100644
--- a/games-misc/wtf/Manifest
+++ b/games-misc/wtf/Manifest
@@ -1 +1 @@
-DIST wtf-20210130.tar.gz 30840 BLAKE2B 7f959b98495a302d736064d75b63f0847c59b128320b5761efa2b9e13f80e5204e64dfb50c612081b21e5ff00c2782e5a949eb514dc4e5c0d7036ac46918d9e2 SHA512 6cd71f3e5d8a2b40509634717f977cfe1f1b366acb1bfd7a942942af1e8e639ee3ad192a5e4a9d7dd668010dea0172b5966bc2f1667bc497a92773b09c99b973
+DIST wtf-20210416.tar.gz 30867 BLAKE2B 106e6637bcbbbe30d19f5ae9718032c769ebf21c2f394b32f12e5799401b7a94b3f5029a45afea38b76c7e39df558e03b8dbd86cf5f1823ef53ac3ddd10df77d SHA512 9473759b1cae2750d85201938084e44abf1a061c1c12a0275aad0bf7ba47f5702e799802bcff8716c9b82d740123bbacb0ed335666983295c9a5792a1148a3ea
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 8bd3dfcf4942..3930f1441b62 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1 +1,2 @@
 DIST hitori-3.36.0.tar.xz 166404 BLAKE2B 851653744c8fcd200576e93753fa3c4a5a166caf7a6efd8048f5755f3a5b096b1387db73a6e39bc4a87815a2c0f39e71cacd95d0ca9940b3a0fb734cb95f36ed SHA512 fab2f1475895e26ac540c6302902c72b4e1bf68935fd88b216e3be37990d8dc2791b15e84d9eac69d1abd43ac01e40cbe238acabbdd686bf7abb96eb59b90265
+DIST hitori-3.38.2.tar.xz 204992 BLAKE2B 271e7c7c09a0a9cf496783bf19cfc9bfb60a7a94b1addce704e0ee57b9a9d730e6fc96750dc2eb0e14cae2b0d5d8abc7474fe28029b94f0c7d195cdcbf7155da SHA512 6a094e7bf9b528b965819a28b64db0f7b6c474dbd1a54c3063ad2f20b726193a46b4b058566baea7dee889c3d692bd36bdf775a177e430b5772b16762bdc2785
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/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/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/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 926229bb607c..6208037bc139 100644
--- a/games-rpg/freedroid/Manifest
+++ b/games-rpg/freedroid/Manifest
@@ -1 +1 @@
-DIST freedroid-1.0.2.tar.gz 4819173 BLAKE2B 9548cc350010eff47ca13b8b4fd6b1082f16e1fe41bad5c2359aecd7834ef22b27adc90d1d33564edc63a592ffa6934224a0ee16784cf736b98fcb56d287229a SHA512 cfafa4af86a2007fcf761b51e6c7dcc6dc40f4513057413901fede41b7a436b9c8cf7c3e5c29130e5410fab640ffbdc8100043a442555e862acffe9f33086be1
+DIST freedroid-1.2.1.tar.gz 5875869 BLAKE2B fab7dfb16e421394b9b0564a29a2e438152cd3d8a5527e3581823edec174986df473040d58c705765ba50b4b73105a348d39f9e61bb0721bb742c70838cdef34 SHA512 4de2174935e432f6dc4fa3a0fb5efff9bed59ba25593c7860edbddbaea77875a490c3f1e11042b57f0bb72158a3a28e111bf53bb0d10bbf051f67717d4547913
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/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/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 7f3a83478fe4..0304fbec5529 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -1,3 +1,4 @@
 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
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 e16bc5e4f5c3..6c7d2ad155e0 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1 +1,2 @@
 DIST nautilus-40.1.tar.xz 3252276 BLAKE2B 6123fcc933f94ca405f7590ef446af0472f4ec10f5188ae3aaf9cb38a0cb1905a7cfbd69c47c5f1b3258bf915006184caeafa2e10035f0068e758a615c328609 SHA512 6421ce0c30c6f3a406a9c100b4a62e01276b10b6cdf05c9aa862a0ece89c7d231e8d3630aecfb8a1e6b40d62849c80c6c91b3f6b6663251466aa8865e60dbfc1
+DIST nautilus-40.2.tar.xz 3250384 BLAKE2B 8f8bb0c1a060d57695b28df126d421f386d634cbeea007ca30e076eb1b432a4098b98e9a1f39f688f8a920d99ef42ae2d53fe14fb270ba1e7de16aadd037a8d7 SHA512 ff7beab2963231c6e5ccd88098260659dd7fedd38ef6c0b95d66ffa110bfe5adc86477e2c1657eb2fcfe6110384038f75a7e669158712dfc1e2bd3f9e273b268
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 1a82aca10791..8c6e27ed8af8 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1 +1,2 @@
 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
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 a929841863fd..e8fde3b061f5 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1 +1,2 @@
 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
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 ccf1228766c1..0d6822289b76 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1 +1,2 @@
 DIST gnome-boxes-40.1.tar.xz 1696528 BLAKE2B 7a593d535d2a6f0b0750c542a86a8210ac697fe8340f44830134c840d3a7500a6f6ecbbf901d6f37273f3354342b68cb1bdaf4cd7a5a98fc3047ee2ca5cc8b6a SHA512 a035454f3bdecc75222b27b6c1bf9807b21b9b3846300f2afafa3f30d4069b32a258e4d82f38cfeb407b21bd40d84031f57ddd63322dd6ba576c9795f355f33d
+DIST gnome-boxes-40.2.tar.xz 1697352 BLAKE2B 07f9fbad526bea4239a6eac3a3a26a53d30daab938158c4904b5ae674cf64cb2dd0fc6de073c41fc023c66df0328bc02dccf994ef09af597f117914c11bedefb SHA512 22f4a66bb60b47ae7c5ca7fb6f60eddf16a1ad209aa4541f05f732d815a2ac9f2fdac9f6d87cd5cf44d402d0f0d114466efbf129b22fea7b9b054e1b3c3ac145
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 d2460899fad6..fd35f1d6f676 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -1 +1,2 @@
 DIST gnome-calendar-40.1.tar.xz 553592 BLAKE2B 83517f9fc23d3b61f4b9ee824e7a95d0b002b61a6e8afc68805dd28b947347b9d68751e4ad9ce5a92287e3973f19a99e5daa3ad6829eae961988b56d9349f6b7 SHA512 f04db5da5ceb5518766d57ddf14eb0c3de19c499ba00a0f426f4059cf53b064529c2e317198d92f45f400d6f4ae2d34d0fde4dc60293a480584a199d2d3a3a5a
+DIST gnome-calendar-40.2.tar.xz 553344 BLAKE2B a144d94d16502ce6d864b66405f07f8115ef9705859d4e54025dfabcb8e99add6d1b25ba84152850378a79db858c4c7eb35b30c8e9ce80cac9384fb4876b0676 SHA512 1697eedfebd72fbd946024998246f7636c724550583ddc04d1c333b0824d38b2a806db0838a9ea5f39b64802c83fcb97cac792aeb4dc344e955e9c811dabd9b7
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/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/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 4971ace4a706..6dd77343231f 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1 +1,2 @@
 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
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..50d536ce905a
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-pop-shell/Manifest
@@ -0,0 +1 @@
+DIST gnome-shell-extension-pop-shell-1.2.0_p20210603.tar.gz 1018667 BLAKE2B d09becddcab7f24b8efcdb8a6c3b9a121de1654d54c792865e28a08412feeb58d3bbd7698811b840eb7873d3ca7854469f96d1b43bc806b2b3e680b2493beffe SHA512 72cb8a71560d97c92a44d988e8eb0293012565d4eea7b49d6d83be6b844f182db22c7c9d41e68ea3fd272ef7f8b88d97afbce3f867e899e162032507be082a40
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 44c73977a869..d0411c600919 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,4 +1 @@
-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
+DIST gnome-software-40.2.tar.xz 3093012 BLAKE2B 0d51e7e752b9399f79c2fc16ea12b99bb58a486fe050e38a8fd606a2afd9db32d67d14b4ed50d21da163238b30fac20f93f8947b165d8ae611c27057dd572d34 SHA512 ded29be4c59130a4016d43d3e18a67c8cf3fec4761a7a57c067bf075a6f1da5b7726000172e2303ba129b3b5cb8bd22ebfad8fbf0e3248285a4864350f3a1679
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/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 2889e0dd4654..8cb7e6d428ad 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1 +1,2 @@
 DIST sushi-3.38.0.tar.xz 76500 BLAKE2B 6d4fb4d80fdec2e96d5cf91bfe6f0d859154e45f6bcd4677eae0e4c8bdcb20380e1cabcc6621e0bcdcc590a668798775bdb464b22298fe954c3d290d202c36c7 SHA512 c8d0dd7d9cf9d28496c6c4ac5f327bcf605994f189c476fe891d42c0c225d0368311baf06d7d6092805f729908491590bf719a9822513f96e2afe17e8ab962bd
+DIST sushi-3.38.1.tar.xz 79384 BLAKE2B 7306d375f85cc491fa8819e6857b1d61d158149045069002ed7a9c0f08c021ce0e9ed5ee751404a507dfdffdfa99895288f9c9601001818b4d1bc987f94bd823 SHA512 b999e6892314875725bd4029163ae58813b46f0e5c59e58b62fc4491d611b48fc39459f6c5b5e1a7d75d792cfeb66681f4d3a7057e8cde8f5c3364a2312e0be7
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 21c3e7ad1dd4..238996a7770e 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1 +1,2 @@
 DIST yelp-xsl-40.0.tar.xz 660148 BLAKE2B 3f53c568358a4325ffe36fbd3df71c39f638e1757f9a684d6d67b252463be867b66e9f20c115df3053becffe9baf5f9bf44aec32cf7aef1887ee3a8eb4c93b4c SHA512 50ada34e76bc3b14940e7ccae368ef60802b8baf354ac0784260fd4408dcecaedf08697f249226e3236a54b487b86d7e00bffea6845adde42285f10d2a8f8e4d
+DIST yelp-xsl-40.2.tar.xz 660556 BLAKE2B 1cc5605f8a272c968b1deff85917e755d6ae13c826ccb21b8a14f8e6d2d21ea2d5ce5781350370994ba1f84009fea15789389b392f8ce111e67e3f948d042b42 SHA512 d365d6d873878a640244053efa9f2b9f7330a8bbca1c47073f0617c1f9150f58e91b48ac7d28e5b65fd113d612afd65b5f9c3d16a6958a957130f85d2f866483
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 df486f30159d..02697bd01765 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1 +1,2 @@
 DIST yelp-40.0.tar.xz 1526456 BLAKE2B de76ce11775b2940a5590a72a0f9f821a3b083810087c65f870cfaf4d6bb0a34653025d87b28d01e11ce5e3dbd7bca8331c62d701d8c050938756c53797198d0 SHA512 efe88bc8d75d00b48b8a0a8d2a07cc95771a4fd8e7068003333f79336f1272f07f1738d91a6978e3c3a9258c6742551d25e8cd899a77cfa262f22e6cf9632590
+DIST yelp-40.2.tar.xz 1527112 BLAKE2B e588b533cd3b59c200904a54bdb2e1ecea620e447ddbae3645252f134fd0f92fb920b512ff7d27d213307b6bc5bec333faafab291af872681813f710de03a587 SHA512 adb6f5781c13cf7b91c0b2b97a34a271d7f72328a8affb379342aedf6cb0c8ed72f5874b0d67802bab6be9a3e1ad77910c8be872724c89477454d35043c5453c
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/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 79a4e78a55ab..1c4a800d0a7b 100644
--- a/gui-libs/xdg-desktop-portal-wlr/Manifest
+++ b/gui-libs/xdg-desktop-portal-wlr/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 d3a899ef0166..be440a22bac9 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1 +1,2 @@
 DIST evolution-3.40.1.tar.xz 12223944 BLAKE2B 00e37d45c5139e77ab9461948185467c9d2fadd3b315bdc65b6a55fe78e605a1eb65479ced304fc0d5a2bd2acf813164fc567254ad8e692701823420195c810a SHA512 acebe937e7bce5e998b86ceb8e53b07ffc9f558543b72cc5d68a54ca2714684bdf3f22726f243754c6ecea7205ccb1b9411095e9c62ca7f9890d2edb0a0b0d00
+DIST evolution-3.40.2.tar.xz 12215356 BLAKE2B df1bc738ea058c2e624e7d56b69bb13e059ceb25fc4fa26d00823677fee61ccb9adc16ee70f5f702163b59f3fcf760a116eb2eabe2350edcad693614d6c0b68e SHA512 081692e157bcc300ef26179f5e12a22bdc993043ca7c56b63622c4608b3c36c3c2e642d5353124c8661cc1ce2841d147345de86b4171ee7341493ffe0e24fc08
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 233a42b5d7dd..a3943ebb0cde 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -62,5 +62,71 @@ 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
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 9d411a04b1c1..c9202ccf1ae8 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,4 +1,5 @@
 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
@@ -64,3 +65,68 @@ 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
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 6b18f7600ab7..758c4a39e7e6 100644
--- a/mail-mta/protonmail-bridge/Manifest
+++ b/mail-mta/protonmail-bridge/Manifest
@@ -113,8 +113,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
@@ -197,8 +195,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
@@ -271,7 +267,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
@@ -315,12 +310,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
@@ -341,11 +332,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
@@ -367,7 +355,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
@@ -389,5 +376,5 @@ 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
+DIST protonmail-bridge-1.8.3.tar.gz 2728631 BLAKE2B f42d6b09dcef7777ae4605e81698e579d284dd6dd88da31ae1817d679f2b94baac6ee3b73ce172c4dbf1d5a07c4e17f52f59dc95e8b28e3b532be04531d06be9 SHA512 135fb12c6832ecb2476e801d00bca1d46fb3d5931b66c66d30da4f7e52a9d4437103a083fa3f72570d5035652adfcc9e0aafa5011f6eb212878db91c5bbcc53d
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/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/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/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/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/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 1e735ed04a4b..3530f1154bbc 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1 +1,2 @@
+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
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/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 2f1ad22e19e7..6830e01de5a2 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1 +1,2 @@
 DIST eog-40.1.tar.xz 3601652 BLAKE2B 6e3ec73742a0de864a131b25b2ed2c3346aecea9455ccbae701d70a50a45dace90d4002c56829e9a831a16ec827df6e1ab257c9ec5b755b863e98d63cd8a59bf SHA512 1fd2f6689f8a74254f4436fedf8a5ee7c1488d70b467dfb94c3ca3e0e269aaa75a77d15d5bb3544e699f5c8759e30a25942857188cb98b4d9537165b67d6d14c
+DIST eog-40.2.tar.xz 3601788 BLAKE2B ab66481d8fa5c076f0e12c3f16ff4a67d3a544b7483a2791833ea7d7f605898b20e8d8ed100a538e7a7f21a1359c74b96fa81aaf8712bfdb419df37fe711f7bf SHA512 e28c2deb320436606ebf0a971d845e536197ea23c2e7869d3d10dfe5174c8177c7977da37bf01178dc87f875cff2c3f0fbdad63c77578c2334dbfd9d354c19ad
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/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 dd9826f2c11e..446125cf91cd 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1 @@
-DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
 DIST gmic_2.9.7.tar.gz 7401418 BLAKE2B 528edcd45c27fce22b16a9ec279ac91465a720fafcc87ac5fcb6ab2bb8a914581592ad3e4e2cd5a64934bd35b13b65d0832e1ca5e07525205c45f9d3c10a719f SHA512 d54a2a8f61f40dcc90f497f223484b63f9658c499e39720ea7b90b06d00cfdc057497ada4790dc757191e2905ed9bd36ca4076019c519cf79393cdc123b24730
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 0265c837b479..667917701aec 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1 +1,2 @@
 DIST hydrus-441.tar.gz 38807432 BLAKE2B e8294a8eb4d808792f2ff50ad4776f078ba1003962b065883ec22fd68f46dc250b2bccf47005731fcc964b75e07977aed45023da1c7e4513fcfcc29d1b4d1a97 SHA512 81eeb59006644b9b33c33c8da3e003640116488509ce2e1426d2a5c0161adf208e31a45c2a5efc2902769bf91e3db56aabc6384f77e8354e0e113bcc6df3a131
+DIST hydrus-442.tar.gz 38818985 BLAKE2B 955f5d9969bd46184fbf5fb11b1bc17257d184acd34a9533a20bc35e20ff5cabcc3715ebbb39f42b926b8b00f570c7f483eed3b11472c78f82b9ceeafc3dc765 SHA512 5a78338426127b276b067b52f590e275e132ea2676a4933162183e183a015556351e13e55271240059a145627d8a2ce1f6fe1a07ef267580604e998328c5c4f6
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/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/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/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 73e9e49982d7..a72b685b4bf3 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,2 +1 @@
 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
-DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
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 088fbc2ca508..ece4621318c2 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1,4 +1,4 @@
 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
+DIST alsa-lib-1.2.5_p20210604.tar.gz 814186 BLAKE2B d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e SHA512 e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99
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/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/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/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/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/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/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 9bc4dfabbe87..450b147d407f 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1 +1,2 @@
 DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
+DIST libogg-1.3.5.tar.xz 429076 BLAKE2B 464cf767902bd8bd463d3faaae01fecbe33d4cc87dabf38388ac961bfbe24e6d113f4ee88542e6bed6fd7eaaf0709c7f5cb7a306ee910527f79810054ccdbae7 SHA512 5d1cbc2a3a1fcf5543f5729bd5eb560cfc740c5d17a2492ead137970c45e6203ec1f5de536d77c4b73ece9e3b0046eaa9181c02a09de72ac7ae51b1fca1e1ee7
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/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/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/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 dc23d895ce61..fcff49ea4f20 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -1,2 +1 @@
 DIST speexdsp-1.2.0.tar.gz 919621 BLAKE2B 70c7d07f4b23abbb70cfb212a6541288c71f57fffd5fe22ddd94901a7d01fa403a69b7884e3a4a2267ffd45a7e053b1ae7c7fd662e57053a06d4a7efb7889610 SHA512 e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec
-DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
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/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/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 48bfb576b88a..b245ef83d604 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1 +1,2 @@
 DIST alsa-plugins-1.2.2.tar.bz2 406494 BLAKE2B 64148e3e6fcf651a2ac62b6b5f3cc915fe6718d35fea53da08f6f4b1a5ff06ba29e69b8cd2a95e3b9edf3880570b1d0b9267239f705043dab592c27fdd150ef3 SHA512 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb
+DIST alsa-plugins-1.2.5.tar.bz2 406134 BLAKE2B a1bb2f187c92a2999722e22775baf2c1fc4240162bb71f454c60359ef61b46934ff8ecd5af97589bafe2c7f737530cf5a4dcc139af7ed001d8dfe24bf3ae045c SHA512 32aa475ec4af040861c2bfb01eac71042242d2109d3c5102d0111f3327e3f6c9031c32cbb50eb4b6568a6bd9408691a047a39972f09d6087e31ec11f19ddc9cf
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..e977ff14cf44
--- /dev/null
+++ b/media-plugins/x42-avldrums/Manifest
@@ -0,0 +1,2 @@
+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
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/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/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 3555bdfbeae5..000000000000
--- a/media-sound/entagged-tageditor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST entagged-tageditor-0.35.tar.gz 4606721 BLAKE2B c7013ed9bbef046bc46897f59e6bf668f835dd80ece83d19ef9ea83f089461cb677cd55a98554310734c36bb97945db7db13eb00cd7ae06e82c0f3ea00e928ae SHA512 cefebce7381d489ccd821933c3a1d330713d4de6cf9366aa699f5017939620589c95a2ee162aabc7bfa6d42d56b5986f4ecaa2f1f77ec586cda5f6780f0a06f3
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/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/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 d3aad6ead2c1..0f04b1b712c0 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,2 +1,3 @@
 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
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/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 3beec8175209..000000000000
--- a/media-sound/protux/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST protux-0.50.100.tar.gz 392027 BLAKE2B 3aad4eae28fe866bdff456b79ffcccba0658b97b06c29757757a1f7b8318a27c8e13166c0f6dfa0815276af4358dda031b9c2d869ffc007e9b21fb29d0733970 SHA512 8a7f241c1673193141f456367d40260bd9c1d9ec93130d51abebd14e1dfb03784a2cd21c6c72bce645bd362f138e52e5d41182358ea4b4dad50f892025b6dad7
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 fc8209a060c7..35bf5a5751a7 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1 +1,2 @@
 DIST rosegarden-20.12.tar.bz2 6438971 BLAKE2B f03862a8523dd43cc7e2b146446bb943229cfa1c598bc36601695465566d1037d360b15ac78802dbcc51c601e605abc9199f3006b3072e5e0ad2b49da9e15c28 SHA512 a2901d35ef7dac9358350fa47e47b9314698790bb2e2a95c6cc444135f49a92e3fb6d6cbf8710194bca6e57e1c82218991ae3db4aa7b6acea311cb3b627d3dc2
+DIST rosegarden-21.06.tar.bz2 6477323 BLAKE2B f5bb9a471122857666edf033d4e760cbf81b0bbcf255e1248a1f865825677c41fb1a55a64835a168174b420793367214e8dfcedea25dc857e1ec847fae87770d SHA512 9cadfed3caba203ea6db78c3600600b9c5ed0e2963228dd6e8129291618e3b7c617b0d6dfaccce0dd753ce229dfaa8c65d1354f591e2923185fb76dcbe48d840
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/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/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/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 3ecd570692fb..94d25adbc075 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -3,3 +3,4 @@ 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
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/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/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/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.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/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 760efd7fc83a..7f58ba56d523 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,5 +1,3 @@
-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
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/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 ff8760bd1ba6..c8a1cf0a1a6e 100644
--- a/net-analyzer/testssl/Manifest
+++ b/net-analyzer/testssl/Manifest
@@ -1 +1,2 @@
 DIST testssl-3.0.4.tar.gz 9223535 BLAKE2B 658947ca7afc2b080edeed724f8185a3292736df1c71bd0bffd5a6f7ecfef7c56a1589c29eff84f278b2b788e63a881139a62ac714684209ed0cb8425f9a749e SHA512 663dc71dcaa37fe969121980274489fc2cf91450122001e98b8e78e510b1e3741b801fd767f6fca2d0735a184ea919b1672b2ba154ef074b146b6d5d47adc277
+DIST testssl-3.0.5.tar.gz 9224554 BLAKE2B fed4f02f4c5db3975f711e5e1fa0f0018b5e89f8a3afbd94763ec86dc4f739ee25504769b61fc1dd0000ce7ce400f4d3267116cd21d14b003d9b6fd5706a84cb SHA512 0f3fa081f047bf2d3fb2f3b65fcdbec976af54143a2d8ffbece6eff7545cc2a6e134247f9533fb1614d52d900fc66d7f50c97f02678b5dfb9842c3c69c0f81f0
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 3dc055a4f473..0483ddcd84fc 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1 +1,2 @@
 DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d
+DIST maradns-3.5.0020.tar.xz 7154452 BLAKE2B 4d193c06620332b90f4a004e787f9cbe61cd48adcee1dd667ecf0383c0fb81f5b7cae40ee953f077b2ccf060d7429863f741cf942c34c862d6c56092bc40600b SHA512 3478ccdc82d5be45826072f91c1b00c491f21f69bcce169cfeb3dfdd00e0012a9def884d711daa41ea18dce52e069dbb4c31e1e37ecda418565b5d8d6a0ea4d4
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 af48c44efbdc..e5fd3f39f086 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,3 +1,2 @@
-DIST pdns-recursor-4.4.2.tar.bz2 1396763 BLAKE2B f8dad7694ac13ed8d824ddaf613d1a001452ab2c08fcbb0e00d2b2258464b754809746b89998b818c44866f9e4b22c87c1cebf2da852fb7b6247ac6b9fd4b99d SHA512 31fdf62d87e5ee8f9570c6b738339bc8cc65c43800f18c7fb49aa5c53fc9ad76a1ddf02cc44f7129e06b41700b5cb3768ff8f81cc521c28147ea6538c73f8781
 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
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 dae1a3381072..7e311d5110b8 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -1,2 +1 @@
-DIST pdns-4.4.0.tar.bz2 1270854 BLAKE2B 2c855197d0b5f8fc141e4fa19268e68b9114353c7f89157023b9cd6b9559e788b55a9b0eeebea55d4ba0a206229d9c032f0c84c40ffd91c7277eb611a4bc966a SHA512 e7f35539915ee7945b537cfedae72e2b83c86b39c5e44a9268b8a086f44b30a33a64e0b65aad140ba02c349cedaa12820226578dea87c9b666dc75f8bd15c1f6
 DIST pdns-4.4.1.tar.bz2 1276990 BLAKE2B 9771cf3273ab7e8ab4607a91563bfe0dc3f4532b5420861d816eacd2798d66de3a1eb824c191264f9106ec47bd6003d99108b8df678190055948779b9b3b070f SHA512 a6f31972f77ded8ecfb523e8810dd90e5b7aa628746fee2a9a0daae2a7935800f111ce8617ffd71d5ce3881947d4ffc36c9cb37996a7bcc514536bb4abe1f79e
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/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 298dd3907ee2..7142d50801ce 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,5 +1,5 @@
 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
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/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/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/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/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 af52bc2a7e40..ac47a5a4bc69 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1 +1,2 @@
 DIST libmbim-1.24.6.tar.xz 511468 BLAKE2B 89c4fa25573d4e58ec993e4fa24e0ff3ab6146c905fd3110240d2dbd3ba20af8c135e5eb552b2c48b1166444e52023e314d70d4fe5904ede5e2c6d3d05724955 SHA512 b0b15aa5ffdc65e9d7af211df771f85021488258f7c50638ad109173a61ef38872b9ab42005cd972fd3cb24e617bd3fe7b0b79d335e2144558daa218fb2c4653
+DIST libmbim-1.24.8.tar.xz 517872 BLAKE2B ba4d44ea18ecb412d046b1c1cbd1167bd1cf0a1430486dbf760731950b088e66b25c5c870f2e1a49ea78e43bc15fdbac9efed56afa35127d33f6377325677386 SHA512 32a1ed379fb2799c8490058a16f819620290c2a08d0dacacdc7db4a31fb66a4d9c449b4b2d8fd6de898da28815a6c32e3d97a802970115ac2869e7fec0d841af
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 0d2a345ee669..b34b485307f2 100644
--- a/net-libs/libnetconf2/Manifest
+++ b/net-libs/libnetconf2/Manifest
@@ -1,2 +1,3 @@
 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
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 95e0379a6d5b..216b6542dcfb 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1 +1,2 @@
 DIST libqmi-1.28.4.tar.xz 1168088 BLAKE2B 828a8688a49a08f0848414b8e51c2ece4a0035ecdf449a5dc9e2cf3b6ecaf1525d5a1c29e329a584ec054f66b9a141d0ba3980b8affb34db3088ed2b5591a265 SHA512 dad3cd2740804d2ec6aa04f0f140d385c00d5a3854d75ccdf54ee6fa4f3cdfc02de5da21cd8b43d5a7c6b467b94b5001bc857fbab01aeedbdb51c0e3d9da9690
+DIST libqmi-1.28.6.tar.xz 1192736 BLAKE2B 30330a8d085b26fc461c6fec2cfa58757e91093243aed8a4ac6df53a7656881f295a800979ff8fd42b815f96fafd128848765ecfb163e8101ac9c9a52eaaf507 SHA512 f4f7022e8c9b60618062548ec97450d98a5125dbd0e26df3dfb8bda5ab19a1f4c7864d35f7bd77217a4fe5562ce665fa613902b1d2185680bfa5d0c1e229e6dd
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/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 83506472965e..475952f979e4 100644
--- a/net-libs/libyang/Manifest
+++ b/net-libs/libyang/Manifest
@@ -1,2 +1,3 @@
 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
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 e566846951cc..ca1d06ede632 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,5 +1,4 @@
 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
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 26d3221f2ceb..2d161d945fc3 100644
--- a/net-mail/automx2/Manifest
+++ b/net-mail/automx2/Manifest
@@ -1,2 +1,3 @@
 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
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 9a5ec3ab56ae..4554531add33 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -1,3 +1,4 @@
 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
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/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/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 d38d70cae70f..dbac2f4fe5b9 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -1 +1 @@
-DIST gerbera-1.8.0.tar.gz 3579194 BLAKE2B 322eac129481a62e733949bf373fa551a1abfb44bf3ab98693664165ef24b8bcd9e2487ac36f5280206573e929f8c81736cf421a5f4d5719927900314aceca6c SHA512 04c61da4c29256e5b25c0709d7538de6674fb93c74fe8f45d8a441916cb49062734a41117c1aa5924b30315be34b27efc927ef88ce4f68ae44f92e693ad67745
+DIST gerbera-1.8.2.tar.gz 3589779 BLAKE2B 120654d5a9d1ac7dd29da401f2ca040e3331a27dd22a52fdc9c9a958a1a8e918ae6ca76926e636184f3b91475797432728462106eb4fbdc146737e88da07d8e7 SHA512 3831030b4960613e487bdba92323a4b8d7ed63352c1c9eb1ca5eacd3c91d4864d48ef1d1bec19a98b6abed0a827d18ba7940a814fe174b44c2808ad7b85a8756
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/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 fdf4d25dc36f..43b9ba6d6b16 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1 +1,2 @@
 DIST ModemManager-1.16.4.tar.xz 2335908 BLAKE2B dfd3293e9b685d3b01fa3deec111aafca6f11dc27be0a69e0496036e537eecb6f51f592ce1996f47c86b5d9db2abf3c9b9a26e66e9f058ba59982caf38b28ef9 SHA512 5fb7625c9d41ce0179b4e59745b00b815038239552a5438d71ff36b019b398fc3dc6bef709e91a186f5f7427fcb59d79c0b1c3ca9c3dca867f0d5677fd979506
+DIST ModemManager-1.16.6.tar.xz 2339528 BLAKE2B b76a8b6959d988a27d411384440b9bd1b7ac1a9d780b77319e735c4b42c55c51f51304ae936aa9b385634640bcb1a55696d4bd25ffdaf88eb73839bfefe5e091 SHA512 78a928007732baaa0eaed9d587913774d4fb79049d652474f39176190496012dc4c93fd0bd774ed6f86f845f3b9f345bcccf4c7b2438b83cf5846b2bcdcb39d5
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 bf76f132abc4..7514ab529683 100644
--- a/net-misc/netopeer2/Manifest
+++ b/net-misc/netopeer2/Manifest
@@ -1,2 +1,3 @@
 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
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 516a3b3af854..cc9e42bfb518 100644
--- a/net-misc/openvswitch/Manifest
+++ b/net-misc/openvswitch/Manifest
@@ -1 +1,2 @@
 DIST openvswitch-2.14.1.tar.gz 7388751 BLAKE2B 5f73dfc76101724564b1e8a1a79a13775e0394bcd97690b4e6ab860db5f639c636573d70927d257c6f8cd80b5b1780f909ad0521b842069bc6c6e069696bc416 SHA512 1dfc119fc230ea7bc2569544d24409b624593f16eea8d7034e0fced8ccfa09b0cde65244f9032bbad30885feada12c28065b776eadef85fc714743139ce7ff0b
+DIST openvswitch-2.15.0.tar.gz 7434380 BLAKE2B c2f855ece89da3277f090d4328ff1659cc4976a4dbdfa44bdd4e750ea80e72592536af00250abe25565a6c2cda9f086ca22dcc16ed9db38692028a758995e9ac SHA512 a4e49268d6dd7d9d8fbf2005e8ffe45ede0998d21c98d7018474142656c65c05b14c8a7e4c7d8e0eea36e28d87550826225205e1fa03055d35a8cb048617c832
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 f6abf34b3093..c2b260fead52 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,3 +1,2 @@
-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
+DIST ownCloud-2.8.2.4246.tar.xz 15044652 BLAKE2B ee1ee412667266273a9a9722940559562c6c43213b013fe7c21328e04ac967afb16f460e6fa711f37d1d4ea7d0fc15fc398d835cf6a939f4c8dfd54cd4846fed SHA512 0ab2ef72191cc2d5c2621c97c09cb1d25472a30f511235a190465e246a8312f13a255011abb9690c481887f2f15094414c87ce594252eb8debcb39b9cbc8a178
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 b607a10d8683..20fb7d1cc425 100644
--- a/net-misc/proxytunnel/Manifest
+++ b/net-misc/proxytunnel/Manifest
@@ -1,2 +1,3 @@
 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
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/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 2dddb7b50d2e..a78fc7b374b8 100644
--- a/net-misc/sysrepo/Manifest
+++ b/net-misc/sysrepo/Manifest
@@ -1,2 +1,3 @@
 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
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/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 ab2b44814599..f09e9096dbeb 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1 +1,2 @@
+DIST whois-5.5.10.tar.gz 102555 BLAKE2B 9f1236ceeaea839e5f2a33aa63b39fa7e0566eeb4d2131b88b47dd62f037639a5860719a645d9cc2d0707faa1e86c9822634dda37e1a7a8d3b31a78cf34ecce2 SHA512 5ee92c15146353e77dddcbeddb6e704e0c42d29b8c0ff899ecce80f8e39903e8c796daec7f3de3f197d382f88e7cd4abd470463ea6c13a01347d0cd15d99af28
 DIST whois-5.5.9.tar.gz 102516 BLAKE2B f5f15568558e9f82ed19dbd35fd43f3067953d4766477f71bfb5d638cbf328fe95012633daa90ad14a6bdf836161967684562f6e028bc204f2a9ed539600c92d SHA512 ab70181220a6d41dd9add04bd81836c89a626de1b45f617e9ab044a666f0ab99a4dee910cff4b0a6a3e47b5e0a7320c2c20f3ff95c2dfc852123d4f672629e16
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 6e29dcf83179..45f9793c2558 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,2 +1,2 @@
-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
+DIST you-get-0.4.1527.tar.gz 164994 BLAKE2B 5bdabefefa92d9fc8a6d7a0f97a4aa7f1e15161f3f8add7e5392ad2994abb0dc082a68301de0d0979a9158515788695413e3d5b1c343b51209b8a3bf22343aab SHA512 9543d49e1b6aadfc6e9af57457a567aa8a804efc255c86fecfbc90c150b9ad1231d38730735ad9cf075312e4ba83f4f3bd71f088d14b8928f7e6951535029f8c
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 d1e2bb452f12..82b0405b0ff0 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,2 +1,2 @@
-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
+DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3
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/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/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/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 bf0384c87310..f35773ca085e 100644
--- a/net-vpn/i2p/Manifest
+++ b/net-vpn/i2p/Manifest
@@ -1,2 +1 @@
-DIST i2psource_0.9.47.tar.bz2 32488438 BLAKE2B e1544475dad526e242570918c1bb967a4b713567e71201e08b73c8995743a68396b5951f477bfe8830927c0cdf7e991a25a1978d4aaf88cae3e4218ba57a8818 SHA512 7fdd9ab0b3e81aa89e73be6fa172d723c2b5a67365116a1e0e0ec948067fe4f58e3ad946a0ef4605602c0d803b98e37b2d5692a39a14cf7433d546ada204cbc9
 DIST i2psource_0.9.48.tar.bz2 33029295 BLAKE2B 8210018610d3dd8272d3c136f32048ede9446c517971be97d6588c6a1a592e9db2261077da3634fa29af28ecdb488427dd1145a731b130b75f41c3c56a8c8779 SHA512 ddfbc8f86bc2fd4012e14732493d30e292af1603d74b1f786a0ecc56a1373301ec9b3fd16fe2e37777f953053291b8efdb5510959fcf1e42d7e5f8ec87d85a8a
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/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 3ec4715ba0b0..d5152a064258 100644
--- a/net-vpn/wireguard-modules/Manifest
+++ b/net-vpn/wireguard-modules/Manifest
@@ -1 +1 @@
-DIST wireguard-linux-compat-1.0.20210424.tar.xz 264200 BLAKE2B e1d96786d60489e85312f2927c0c5f8d43cccef9c4929856d9e892c91351f091e6a457e4673dd0c4987a614b9c13be4a4d9d485390c3a45fdefdad5dc7131213 SHA512 f3485978fdd5a1cccdd8ee269c223e805bc533b79189765324a383142934b12f4f6bf476147a09703fa674da4a1eaca13fe400553b27843dbf8da133ce19207b
+DIST wireguard-linux-compat-1.0.20210606.tar.xz 264952 BLAKE2B cc8368cf764826bbf9f76246faa8b1a366df0e2e65b14ddb52b663cc75ac5edf89e8da7646aa6b0ae952000289ba18174bcfdf0fa7ee5f6d9c81e2f5f3d6e114 SHA512 ef8ec9f3d87982bf24b7934d9eabe605391888955110b655baf26867c80b619f549edc5527cbc6098c1f385b977a5b5d580ccaa82129571a64133a40d072c9b6
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/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 9d266398901b..000000000000
--- a/perl-core/Devel-PPPort/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Devel-PPPort-3.31.tar.gz 218537 BLAKE2B de65f41650935e661677dffc977eed5d134127ccdee8b721d90c634b901edd5e282d6da6583d62d93025684c0fbd6940eff45142eac31a271b73cc477c17c6d6 SHA512 7c139bbf80b06abda61de5f1aaff162d0e6bcec3f06c75a8519610d0e5766c9a24513d36681dd082aaee2238eedab9c971c89d0c31ebd16b43f2ed9d9da12e71
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 6afaa0ea84d1..000000000000
--- a/perl-core/Time-Local/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Time-Local-1.2300.tar.gz 19818 BLAKE2B dbf357a4732106101c78ff1c012be2e747b7cdc06d91ddfe2821a616cbfd0580510963b9ee57d60cd10e3689019b57a5b939995da0be2c00b65033bb4ec94519 SHA512 812a4e1d8820becfc4c19a3a862e5234744b4124b99fd33c856e331e0f2f6131b98ae9e8cfde637c9db5b2de036f643424f4d2d15bdb47fa57dffd8f3bdeeb41
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 8f8ebfd5810a..000000000000
--- a/perl-core/Unicode-Normalize/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Unicode-Normalize-1.25.tar.gz 40530 BLAKE2B 2f2377b8db42535cd44133311a4ed5387956002d37c92fd6a0b02d9e861597eea2ba7049d7a3b2152c1bbf2b82a863a47bfdde1b5c7ef544e895cb2608d9df52 SHA512 f28c19e0293cf75cc0aab669ae0a0543f6a1a39e1e50ff32ab37abd8e85efc73e8b9075e581212b6da576ecbf8c0e9ddb7b9b352674aa3a04c77f9aaf4717866
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/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/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/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 7b5d0a12929c..000000000000
--- a/sci-chemistry/rasmol/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rasmol-2.7.5.2-13May11.tar.gz 9768769 BLAKE2B dcc9bfe9381ebab6bbf5a12e233490f076ead2388a22e3186421e3489bedde987813b1f65ce7b17ef168389c33d03bd7d4a8162635c0a79b3dc704eade23715d SHA512 c4fd149c002a34d8ce7620a7eed37aa6020acd83fc352a4c16697eb94e6a0377c55455cb6da5fb3f492f879248a6707f677f4b35572f2295b23fc924ddf3128f
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 ee615f7a9d6c..0a65165cb9da 100644
--- a/sci-electronics/kicad-footprints/Manifest
+++ b/sci-electronics/kicad-footprints/Manifest
@@ -1 +1 @@
-DIST kicad-footprints-5.1.9.tar.bz2 3387238 BLAKE2B 8c8873a7feb72228fcc92ab5e8950f63fcb09b4b1b16b6f8da5aa3caa30985ceb02e326ebe8ba96fcae07fae71a6233a7d8009fbe6541f2e7c6807ea67c7046a SHA512 28030a750b806be664cb91b3b3e4c0bf2b9efa0518ec55b1ff433633c2f69ab99bedbbdd3264b50cbe80a182e3f97343f5dfdd25e073abe1563231a8318b4155
+DIST kicad-footprints-5.1.10.tar.bz2 3382220 BLAKE2B c2725a83e1d817cbf748dcf173383a53ee00c917d50c00368feb29150d14d1172df8e2b87fa0b8a2f3921658baae833048889c16d45469c7e888002fc63e9fc7 SHA512 624f5bf4a7e9b30ca1f7f8aa4d8270baf59667c91e65b8beb3c36b546fc4fbabd6221cb408458eb166e0364c7b8c77923b5809d94aea3ec65ae58c65055b6eb7
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 e48d78958dcc..5e311827dd09 100644
--- a/sci-electronics/kicad-i18n/Manifest
+++ b/sci-electronics/kicad-i18n/Manifest
@@ -1 +1 @@
-DIST kicad-i18n-5.1.9.tar.bz2 2934490 BLAKE2B 391cd9b8a23f5dd723884704ce231f79d8bf57b7f2852a97b08228e887226f75714c6515c335122f9f34d13a033e9039423b8bbfb281e4f6396ac158bea5f4e8 SHA512 d41359464e3504263bb964af4f14db027f9b55861098f29d0fa97eb2fb26205d49c00cbda4795317a46b54157f2fda67a94be412cfab80ce81846e173bf1a14d
+DIST kicad-i18n-5.1.10.tar.bz2 2934783 BLAKE2B b836c12d5265d9da36a4647b8f8e956c7a7a1ebc8a9467f0c4b1ae6d3deaddaddd6c42811bfa6d89440015f1273bb2356bbd91b43ed62e25b402f4b203f598bc SHA512 c40d170ae247f376da03159eeddafbbb1828612ce274714f6111f1be16d122808e7ecdbd3d79dcf90f13f43ed55d603055eafcaf69cab7323367db711631f789
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/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 f6738e7f1814..ef9023290794 100644
--- a/sci-electronics/kicad-packages3d/Manifest
+++ b/sci-electronics/kicad-packages3d/Manifest
@@ -1 +1 @@
-DIST kicad-packages3d-5.1.9.tar.bz2 727202241 BLAKE2B 2f80b2e1bbc6b5c5d5c7baf77af187dac07d8c9ebc47d99419378f20b3a8eb9eb00da106810f0a3042a90c4bec44b467e78bc9c60b71c2b85e017342766f9101 SHA512 f5bfb9793d204f8f1bf46fe18897d59775fe7805299fd6af0215b8b9e28ce99d5183930120bfa7b5ee8b7599ae3be76f598b42b74db44ee50b7838fada860dd0
+DIST kicad-packages3d-5.1.10.tar.bz2 727194444 BLAKE2B 87d210be8e32e84f29d67f861962f869f62ba1828a6557f75642c652e81239543bbe4d3a2ae8dc34767266d16cb2a51dfb8c79062b9bb90ae359001f39b7684f SHA512 95c25fe94f3e198208f073c121d234508aa8e67a621d17bc1737d14fe860c9a8cece6e7b66037f9a9c7f1a06f104b942dc2ff59f318e8b6854bdddb1d238faf4
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 d3c435b43547..de2924caf87a 100644
--- a/sci-electronics/kicad-symbols/Manifest
+++ b/sci-electronics/kicad-symbols/Manifest
@@ -1 +1 @@
-DIST kicad-symbols-5.1.9.tar.bz2 1814966 BLAKE2B 5c66513c276434410fcd8f9a8c1478fce8182bee3c92c4fff42d2cf13c416ddc5f8c25618725f2f9eb54b216557d346eff4ebea78aeb7ebb3ed960baa3137138 SHA512 21bd0308723cf7dba8ab2294d70714160db6c64e5ebdad1c9344df0b6cd56fb9216d64977de68bd7ca8be190a89809576b71d21486c3e85fe077cceac54aabb3
+DIST kicad-symbols-5.1.10.tar.bz2 1815573 BLAKE2B 030847bef5b0420fcbc0d77adcf14f5e08b738ef7c547fae9da70fb70ad1f94149eaf482d1d3da667b369bad6e08995fd3920807cec45bb46efde882404ce820 SHA512 f9dd5a0ee135bb37e1be723c6213f3c2148b1579fab5f56c859d0ca0b55afb81143244cdaedd6d14ab73228176be9770b7dc04a4fe118e9b9f1464c5f79c6b46
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 6aa91f44e03b..0a966457efaf 100644
--- a/sci-electronics/kicad-templates/Manifest
+++ b/sci-electronics/kicad-templates/Manifest
@@ -1 +1 @@
-DIST kicad-templates-5.1.9.tar.bz2 1552087 BLAKE2B d6637fc8acb2906ed2b07dceabb00982b4b9d8d4bb9703f8c3aadc174d3f7945748b80fe5a7c0b40a4f2340c4af7ed04cf82b775a5fbd4d807949c5c12aa67de SHA512 284676c7bd2c4bc1b1867e73da4827fca0df965a43850641f1836c0cac71b6270984af4fdd75fe25bd7f638f4b08ee115e84038390855d15c089f074ee4cff4e
+DIST kicad-templates-5.1.10.tar.bz2 1552124 BLAKE2B 95e876fb049abc5fb1210bea63e389c88b43efbd8154ee95d4f910621954795c20228f5a12a5d692ca771d55783c7b9c6942c21bc27d54027a68aa91152a406a SHA512 2e2f3fbf79f82e3539d6ee31aef5c854695683b7cd142a4293c37ef04845f6d90e8fb2f4f9027efc0e3211703336d4dc65f2573266be0a20b1b139fbe3ee55cf
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 a3d6d27bf935..cf4bdc5e3f72 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1 +1 @@
-DIST kicad-5.1.9.tar.bz2 18597932 BLAKE2B bc91e1249378970188f968590f70f7f1e4226f9d5cf576da6b3e751332f3a6a2160f261e7a28587ac71bae2e03f77ba3d0aa703422515ea1bd24212de5efd108 SHA512 565226a1ce8d8af8011062f767366b60449d9ce5961f343e495d5b996fb66fbfc885ac3d383892879bdade9e4d374816a54b5eee754fbe5f257e8aaa8de8f739
+DIST kicad-5.1.10.tar.bz2 18586889 BLAKE2B 2d087e7102746d3570c4e448ab7dfb27f63eac5d5036ea55970770025eacf1f85a26f7bdb0b83be546c97dbd4e9050f46045254334ba5dcecd3197d368d1e975 SHA512 3b97279bfe7e2f45e07d347317f1b4cf9eb604331a6383916c87415354da665c80b567d031bda123445ea100ae12075f01d112b473b45516e3aa4d79d1841fa0
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 3bc7e4add56b..f149050a888a 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1 +1,2 @@
 DIST gnome-maps-40.1.tar.xz 3543432 BLAKE2B adfffdcf6e3730414ebdf1da0727ee3c20d02b7e1c57f13070d5a08d9895d24f91ad452efac1465e881912f93fe4417cb255ff62324920ae73d482183d50cdbc SHA512 319d819737f6b370cd5344d4483e06781e362930610dbc4745641a208e71f753bf894693009690a6fe04bceac75ab5aa7788ae2511425cd0bd2b9229a5d0111c
+DIST gnome-maps-40.2.tar.xz 3542008 BLAKE2B 65f23bf61e2e3c24afa80b74400dd929510c91ec463aa7e36759b1ddc60814538e21d883df37b98b5d4da851705e5f8e78e9d54a8b50a9cfd490a3e965f34b87 SHA512 6214ebeb8f5dc5fb28e0aab659a2b9f56d6b0c7b9248cd3482a268a6694ca04c75d91686a7029ec96904efcfca91a028d66d17b6311efa7e95b76379c68f6a0e
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/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 83e5d601f292..000000000000
--- a/sci-libs/cbflib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST CBFlib-0.9.3.3.tar.gz 5787633 BLAKE2B c07b73f037f84c84613dd33a7b403d9f934d58abe12016167a6d9ef7633827ad46bef0813b5040790d4da03980285527b43ec0a899e46d8e4823f68fdcbe0765 SHA512 e041c26770e12e09110d7c4f39737406c6ade6cae6fa941cd31dd3b90432a034426272b8daa851a8a23baceb7189479d2d8bde882b7cfdb8ae666fadc5be57ff
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/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 3c042087a64b..6c175d79bd31 100644
--- a/sci-libs/libecpint/Manifest
+++ b/sci-libs/libecpint/Manifest
@@ -1,2 +1 @@
-DIST libecpint-1.0.5.tar.gz 1313876 BLAKE2B 279618262bc32928964d559bda3f2d6235340bf807abb755c676a20ea6712d36d80a84a2522dd16d19290f5d622e47c4c0a34b549ffdb628f6c07372a5109981 SHA512 ad68599c1a220556ebb265968da6701596cf2388aa422100b80863bd8f73eaa1be5a2349c0db8c8864c3c8cf57151fe3d4520a3670f3b40ce147195079886d86
 DIST libecpint-1.0.6.tar.gz 1331016 BLAKE2B 9b1a8452b6810eaca17eb9e6efe876537ae32e980593ec89681fa4b2d6eaf5a908d5971c774eccd75858025599eeeb119a74b03fdbf7bcee644316dc6acad0d9 SHA512 8b0bf20d263891255ea8828cb9df7c919155ef461a66ae6c8979e9996e3392ea1b7adf21ef9ad9188e2f56547c1e2b525c3711f7cd1ace2b3c09b8ae38f75ee8
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 b4b1cfca5372..e1e9144dd425 100644
--- a/sci-libs/libsvm/Manifest
+++ b/sci-libs/libsvm/Manifest
@@ -1 +1,2 @@
 DIST libsvm-3.24.tar.gz 876441 BLAKE2B 6781804ba9706de5ad363bcbda20f2ec181cc4ee9613c9e7429f03872f7a03b04859df2ec00692d9de3ea237d1e478435a4d4db3ce7e5292689a2eab26a1fe46 SHA512 ff3c39bc84291bfb707151d7b8b6fb2eece937afa769cb8ee579d00ee4c30e943d476cd7bb18851d482c9bed89cf94fb3fd8abca4d47253360e12e9406f2f24b
+DIST libsvm-3.25.tar.gz 892471 BLAKE2B a80b7192981811f57446a966c911a07a2de17042e67faa26451c23129dafeac642596a619731b57a27d9845f904e2e4c5c11ae8aa3006fa49e2f62d7cec4cca2 SHA512 91afbcfd204f5fc9c367df446550cecaf01d5e34770fa10fc6bb02277d79b756393f7d057290df0f72fc941faaf0f4c84a863a3bf9d8628eeff1f99b6bc57a98
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/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 02b58d035b7b..d1a7c272dd21 100644
--- a/sci-libs/openlibm/Manifest
+++ b/sci-libs/openlibm/Manifest
@@ -1,2 +1 @@
-DIST openlibm-0.7.4.tar.gz 366281 BLAKE2B fde965cdf66e8a872761e3df0715527d768a12a44b03af16a16898e66223ddb16809d13966a3ec222eb1b4fda2d560b614975c731df755a99b1d5f53a3da12fe SHA512 d824f909c52dfe78a5e090187d32f8c4744776235bfe3ad1fdb68ea3d3f8d1d358f228d0c83fbd5baa558a603c66c171e74e3f2c0cdb3d517f19930eadd35a91
 DIST openlibm-0.7.5.tar.gz 366889 BLAKE2B cd892965122237783cc288e57c965ae56d26fdcce93d89dd764ba659d292ade20baa754af303f04b831902f62f95388e2e7e11c050a0712a235bbc5793f2a9c4 SHA512 fe5797f49e9f9ac70485c53c6096ac273c33c7b44fbb694788717f0e427fe9a8e121939c4c1334f2d20f2fe1f440d952cc20cbdd49717996a2fb9a1045b05799
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/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 405a862ae51a..5dfbd7f55310 100644
--- a/sci-libs/rtree/Manifest
+++ b/sci-libs/rtree/Manifest
@@ -1 +1,2 @@
 DIST Rtree-0.9.4.tar.gz 62017 BLAKE2B 72a979a3b9b9e9e1d18ea8646bbf860413c18420ce40946108c4f2f0e59fcb5bb64971a57936a92714e02e13419f7dc594b2371e4b44a4fd6a3e3986c19f7d85 SHA512 59981ffefedac1162faaa86ea10d7d5503da46c7ae9588a57e1a49214043de5f41bd4836965651d4cd22e7959c37cc6d586d9912568a2aaf693a0afb7895b429
+DIST Rtree-0.9.7.tar.gz 44877 BLAKE2B 4ee5ad4c478ada448a8faa5ba29bdfbb67bc2f688cb8c6f465f4637fbd890cbd997f24573b25a936b7ceb503cc0b7684a1932e6ac91a85e4c37730ee9a6d39f0 SHA512 35b39e29f6d2b9cf4e774191bed69ade515680d07213f0ba74748da11ba916b41c93dfc4f489d7320855f3722ac8b5b58bac4614ea95e6230fcffe33f4332607
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 1311005993ad..a7e2357d1ec2 100644
--- a/sci-libs/volk/Manifest
+++ b/sci-libs/volk/Manifest
@@ -1 +1,2 @@
 DIST volk-2.4.1.tar.xz 315072 BLAKE2B 1ce1d220f9e1e9251332fb6caf7d72eaf3db85009a49434edbf6490b02ab016c4b1eb8677f0e5f446f5783615f2256710621b1806684dffeb1ff441756e4a635 SHA512 7c16a5d750cdea2927c3b08dcad29e19f10932a3b7b35cb25ecc66554d7e441c95906a4746fcf62f895709aee1191f1bb91189c3509b444b6b4ba37a306f9909
+DIST volk-2.5.0.tar.xz 322280 BLAKE2B edbf0f7ffecf08e8f0d8ebbb85a9bc943286c5d022442d0d7e480be4ecbd696a8b2e87e4d16d7133467b429e4894a1d166c534b5a05630cb313906aed8476cfe SHA512 94e5af925d6b6e157445ca80c2ba47a92f5ee681716d2a70a5519caa30a603b3f31a9f1ccbd14ef65349645b56a3f406b4aa1f354c322be60bd76d646a4850c6
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 bf59a99dc8bc..2ea1e4443086 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1 +1,2 @@
 DIST z3-4.8.10.tar.gz 4731869 BLAKE2B 92487f71a0c8d961949dc23032d8fa3ff157fe7acc29b41d0d79326f8b59c60e19f43527cccf4e51872c0f0664598f9063876b04cc581f918aa48c37a13c4f3f SHA512 d2741d7ad3e1d5ee3fec92095b061a96a700c3327b2eb2090d4162bdcaeaebca8c072ef79c5daac1f6de3456165c2cc38e13f1045bc707779d1027b943837c5b
+DIST z3-4.8.11.tar.gz 4799940 BLAKE2B 5478f9f45f2dc8ea5d2b781e79d886e77eed5ae034498b434dae349aa76f05836d8fd3134a08b381830b57acb3896ac51337d5bbe480dcce4770f2cd4fbee841 SHA512 ceab703d0413d0135e0f4e6c3ba2bb58d6a4823385edb0bf7ecc96949a3073b687d415a2674c86c9f876adb52823f98f9fbbc107d799ed756dc16292f9864894
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 54196487cbb9..5b5458b97cb4 100644
--- a/sci-misc/vitables/Manifest
+++ b/sci-misc/vitables/Manifest
@@ -1 +1,2 @@
 DIST ViTables-3.0.0.tar.gz 860411 BLAKE2B 7ef5a7ac681ac7d0d2544987080478deba39db275dc0559db48d0375ebd83f260eb37dc3b9e99b131fd427b81668b882f15549e6f1955615f9dee5927c6cc57d SHA512 0ab0a3529f70111f6d2c1a765398d0c05607e2839a353670eebfa26bedd2092a33afe9f1cad14eec5d23f76fc5f54fa6f61e2e4089d9c2f3fd43396dbbbba7b1
+DIST ViTables-3.0.2.tar.gz 921231 BLAKE2B 5800cf222260f0d4c4c7c652f8ecab32b764f3555d7a19bc3aca6acdb68648b0b381389737a67f8b2d558ba09dc9f9837103a6c3c27ca6f7b9c0b0ca31bf8978 SHA512 d9b5fc0c5c31cd663a5ce8af415b8e7feef89b5d542933dbb8809961b9bdf325d115238526856f928e8326192e73c8cd84879566d569d70c6418921dac444766
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 6ccbc6858913..000000000000
--- a/sci-physics/jaxodraw/Manifest
+++ /dev/null
@@ -1,2 +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
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 db15b30feded..385711733914 100644
--- a/sec-policy/apparmor-profiles/Manifest
+++ b/sec-policy/apparmor-profiles/Manifest
@@ -1,3 +1 @@
-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
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 6f860e255701..8b70f08471ec 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,3 +1 @@
-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
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 db15b30feded..385711733914 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,3 +1 @@
-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
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 c3a9128a6da9..225b7624ecb9 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,3 +1 @@
-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
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 41dbe3bd2d07..b9ff8e808f5d 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1 +1,2 @@
+DIST bolt-0.9.1.tar.gz 250978 BLAKE2B a3b1ea51704e2b54abb0135013019b9cad6ed9c0acfdb56797e19c9b5a1abe9f921446cfcc5b664f73bbbff857cf8d420f588517d4c633d1b3776a35c37fc882 SHA512 c925c290de75d3fa2dfb9e86b2f14ea39279b3f2ab6bebeced72a7853c901d44de02157d684534af2b54edd3a2e0b2ba61e889579ab1b192f99e98a2d73685d9
 DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78
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 20f9db713b1d..d0f7c4fab10d 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,16 +1,13 @@
-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
+DIST dbus-broker-29.tar.gz 216639 BLAKE2B 94c8b7ea01367eae176d9411af064a960a054d6fbeb2bdebe9ba983d0938443abeb521f32e0eb9ae28155d5c5ebcf461317223387ccfad624ddd24e6bc8e227b SHA512 4c31b8c15f5d1ada0eb9c63c905c9fc9b3b8336beb533974b9c2b2a6a89c306b77d029d1ddbccbad873f62cc0d02cc373a090907dd19eae1a8a7fc2e3a4c2113
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 3d3a35a0c2eb..a78528391da9 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,2 +1,3 @@
 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
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 99f077019d6a..32c93d319805 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,3 +1,3 @@
 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
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 1d5bcf84967f..0f40d9cb8173 100644
--- a/sys-apps/lsvpd/Manifest
+++ b/sys-apps/lsvpd/Manifest
@@ -1 +1,2 @@
 DIST lsvpd-1.7.11.tar.gz 90366 BLAKE2B 2dfbbc92921106247580395ac663731bc4486d9380b052cfaa0867939a22b4c10d130adcb01260316e5c0fa5a093eb8c95c0d0b04a5ea17792e5891cb302a554 SHA512 68efdbee6bbfb4fd6673bc83d340aea6a121d48d1e75dcc4f9322521d8a3aa7b04fbe1acbb7e7343c5a7e2dd33f21ecf2e54a32ff5f6f2b9e1e5d6c34b8b25b5
+DIST lsvpd-1.7.12.tar.gz 90806 BLAKE2B 1b55c463602105c36654f7baaf5d7c8f27ec045f35a648e87327f5b0b1c19ec62f5701a48d51114435dc5edfc503b78c35eb109a7982d6e6c10df4dd0d20e4a1 SHA512 0a37a580432004c359080edd2b07ea44a68dcf81621e0ec3a89cf7c4ca0f64a29143cee154a8d39c1411f64bf229a8a19f10d9f2c95971374b97a4c05b1c1523
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 cea0c1a42028..59045fcf26d9 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1 +1,2 @@
 DIST osinfo-db-20210426.tar.xz 118640 BLAKE2B 934e738ede6b261d59fcb30e3c12d64db86ece75977709cbd59b2e105297731e1bdb6687b0d4cda80972ba2a20cc445edeca289c49bc5d056668bee5066d1216 SHA512 b5c2ed444559dfd1903e16f6c29cfd55cd279a789db93e7b5a0dd450ee48a3bc07cf59ff057220b8ccf1097a04ca1be4cd77c10fea292570ac58893fd788c0fd
+DIST osinfo-db-20210531.tar.xz 118600 BLAKE2B 5068014ecfe5bf213e5dcdaca392701199362297bf7bea0793f7add21602285e53184a48a7743da3d02427bb5eb94062f222fc83e0b46d4052039b562a692d7f SHA512 59fed0d89865958338938b8129065f7416813602d190f41c06817c6ec7e634cede7a306f8cd3797cda37c276efb11598448fe1ce215a9ecb5df9135418cff932
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/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/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..3938ff251738
--- /dev/null
+++ b/sys-apps/ppc64-diag/Manifest
@@ -0,0 +1 @@
+DIST ppc64-diag-2.7.7.tar.gz 423357 BLAKE2B b32def540811f383e401d352d17f2edce6a998a91a7b27bcab981e42469f44aaa505104ed2d2ced8a85485c0886525ff5128b36cdbad3a8eed90e8002877498c SHA512 42d94214345ab8deb7bd9ee8b145052fc2f733ba13d1567dbe6592fe9306670e3cd0ab6122e515464f7050753a992061c056e009673c7f8f6e554e9eaf75c550
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/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/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/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/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/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/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 0b703dc303d1..1faed5903ac3 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1 +1,2 @@
 DIST fio-3.20.tar.bz2 912040 BLAKE2B 44f8c20a390a6382aadc07881c1e7c65cca932099a1b3992e848669cf2a52b410fde67f9ae576efcd0d8e88ceec04174b6bc077d4b3f9b615b59be9f24f62bed SHA512 4e073754c95cb8d6416a80f48ca61003f34d664717f67a3f29b554e9205f8fe3553595ba6f8a8e9cb3463022d5c83be961f5b5a1ebcd2a9f4da9406a9986c1fb
+DIST fio-3.27.tar.bz2 960330 BLAKE2B 7e7e01a5c1d6af13a6f87139e7738646cbc8f45ebc370d0c45b9efe1f93778613d374daafc6df459f988f27f2be54ff636235e1e5a92a4a6ecf9a60ed573d170 SHA512 9c5f2ab0c9ac24ab78dbc74fb6c5acd60f8189fdc618f4280992141b6c0abe1c235c373fee18ad0c803e7fb25d480f45aec56dc3be2e0d26d181b3418b179f99
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/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/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/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/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/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/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/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/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/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 183307588c68..c0456a52b334 100644
--- a/sys-fs/growpart/Manifest
+++ b/sys-fs/growpart/Manifest
@@ -1 +1,2 @@
 DIST growpart-0.0.30.gz 7897 BLAKE2B b8f28615578c1b19a7cd2eff9cb60c37929c2d3767d9f98b07b1040f7f5d2687f41ed051b9899573119b4de9c2e04dcb91d76fc70fcff7a6e6dde0335959681f SHA512 ed6cf92149c0802c4a08427fa025ce2666dd7c32c5d1f362f4d14973f709dfd73124fd85b7eaf179daad5dfb1d126e86d7db0fb1fe7e2d496e17bf0bc1bc9c58
+DIST growpart-0.0.32.gz 9525 BLAKE2B a7c7ca27ae237eb7d6e43decb16cba2c8a26b63bcfe1b1f74f63b116a9cc23fc5e54394df846c13de6caeb8433a4ad7e76046f2f4311e6fe7cb069fce588b6e3 SHA512 baa9e59581d2d9685d4b0e7563e6582130064881f6f9b9fcd3250a4bdceb7d03bcd1ce346218ce4395f82de948f85fd59339cc30417377feb61d5b444f3dde23
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 1185b80833a3..f76ee6105087 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1 +1,2 @@
 DIST libeatmydata-105.tar.gz 419427 BLAKE2B 251fc4226ddddce16abc16c8a0717cd69621e8c166cf7a7dec1c8782c2a25edcf26e34f1a09bd2b6153a46eb99a6cf4b1adc334db188201b12a27b4a1562ed03 SHA512 fb2ac1400d5e3c44bfc952c72f29a4c7234edf5b756a9602ad822c57fbc9813c35d2da9492e2982abf81e0826d278da2d31ee1865e806754e0b387ad699367d4
+DIST libeatmydata-129.tar.gz 358437 BLAKE2B 448cff19629fa1a07443a52ebe16a7bf9a8ac7d0c2688e89555ed6c9c2369695a70ae2abf1b74152b3c305e6bc019e2e9808af6642122cd10a73deb7dfb580f2 SHA512 dbd0ea4df77034ecbb75955394b15aec6f1331205a5c7aa4a6e0595e3e486bbcc81c28a264bf5441c660563f74bfb06630da98373d481a2ebd9e9b1538c109d1
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/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 8cb28021a1fb..e97d3aaa4455 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -3,3 +3,4 @@ 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
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 e96176f6ddab..a940f6c9f8ee 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -5,6 +5,6 @@ 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
+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
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/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 18e52567aea6..17eea7760c5b 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,2 +1 @@
-DIST gdbm-1.18.1.tar.gz 941863 BLAKE2B b7717224e966321d7499a90214bfb62d0402e867db475ed4eddacfe3944d8d9cca1052e41d625f447936bfb3cbd7f1b79cfe6ff435a018efed3d5a7c5eae52d7 SHA512 adf9d6c5bc843ff0d7f88c2a1667d509973b2d63378d0001d7e74cc10aee6ea498a4513cc88ddf78c32ba4db5cb040b2794f4f1b3338c65d9894058850e2f5ef
 DIST gdbm-1.19.tar.gz 967861 BLAKE2B 92a1a9c461c763b01d7abced58800aa8db200ae746240c8ef8079a615d920efe95f0d805a8cfa63d8aa6bcbda637bcb07d98d630f58de5678b7633c3fcf6bf9b SHA512 118c5b8cdf74898bfb7c2100302fedf80096be017bf08e80a44486563cad5d93b93567622f2e7c7aceb72f30460504bd0b4ddfccf34df994ed65166e12ecd495
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/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 db15b30feded..385711733914 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,3 +1 @@
-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
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 c24cc40930b4..91583ac0a494 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -1,6 +1,2 @@
-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
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 671d87f49eb9..bcb7ccd2a724 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,4 +1,2 @@
-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
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/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 5f2acdb512cd..e9dc2b072bff 100644
--- a/sys-libs/libservicelog/Manifest
+++ b/sys-libs/libservicelog/Manifest
@@ -1 +1,2 @@
 DIST libservicelog-1.1.18.tar.gz 453645 BLAKE2B bacbd3c24d97a563cc3d51872dd349780416914c8f300ba63cf43b666e18f3fc7693556ecfbb21cbb2d66e14ac2d26259f0a587a21cc70ad660626838fd4281f SHA512 a9c4a8c778c257cf9df3d35652d707ef5ff1df1bf40484a7c23bd547127d2eb0f3465ae524e2c4ab3cd67946431ed98ec876e8b4332b5f27df2e927309fd05f2
+DIST libservicelog-1.1.19.tar.gz 90198 BLAKE2B 1abeb831fe2103c19e8e7d2969c9749d7aa7f77ee87b2423b11ca13c717c9d026df60a9cd9c7067e484b4b6cf890ab1d3db1aba6c1071c0dc2583d350dad61e2 SHA512 71ecd7ef59a30fff6336621d279d33520d2d772445af0382609cbe4f311dbe31f35b4e03b3cfe918a9793b065400e0004188f5a5635a0ff71e62cd4d2e78ad66
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/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 00598ae67ab9..64c0055b3099 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,7 +1,2 @@
-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
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 d30db0a13c4d..e8c04758b2da 100644
--- a/sys-power/thermald/Manifest
+++ b/sys-power/thermald/Manifest
@@ -1,3 +1,2 @@
-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
+DIST thermald-2.4.5.tar.gz 455875 BLAKE2B f080dc065f5a0227cabed8e88d44c85c6e8ac932a6042b095a91840ea586213fe1b8ca93a04ee872f3e971d1efdd95c0f50357727d70b8e4fecd735e9c840f73 SHA512 8b7d75b3f1d7a98a9985c7552963cde19c81053d12fa39974c1129315fc23e66a432d9ada5d9e385989976453a83cf6418f410d3ce3317e23133d15d2ec37695
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 ef48a7a6a763..5f9086aee160 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,4 +1,3 @@
 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
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 aee01f865f8f..fae57a8a4057 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,2 +1 @@
-DIST owncloud-10.5.0.tar.bz2 23471398 BLAKE2B 6566df51474a22d36da868ab45a7cb679528aecc9a95e0ad20f06adda587563e16c98ee1e942a5fef62e633b132469a6a775d5893754f553aea8a33043daafc3 SHA512 b77183146ee27c97a7f472e1debaec6f5dad168f204a243a65f431cade28ed0551d0db88ff799776bfd26db60357a2216a35cd1b4af6e7e98fc933f325e4336c
-DIST owncloud-10.6.0.tar.bz2 24569416 BLAKE2B f20890262551f2996d39566f63f79439921f41bfa3a82cecc5fdf771be93e403f5a273e76498421ec7e29a03f00326844003c3adb3f927f2c1c8fc82c26c23de SHA512 ec4de23b4cd0dc08dde66802285a00c817cc8ccc79237e4ae454af5fecba102fdc892ed24e62b246deebba536728d312f43dcfea9f2f490ba8847a54ac962885
+DIST owncloud-10.7.0.tar.bz2 24129028 BLAKE2B 47ce3584f8123cc0a315c7d88847df5844c951e354fcecd7a876ca01f0fa24823a86bdd950dd885f3bbb46f60d8a39271e31d43ac6dac8f3df506d6cdc531231 SHA512 ebb636b8ffd06d4ceb1dd0d50c15ab393b8c7bf2f0e23c61ba957add6ac4d4ba4cdefb9cda2c703f337c82a295e2c40a467a602227728e9506f9a150c9f2fd3c
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 9493421a887a..f567d2ff2d92 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,5 +3,7 @@ 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
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 2d355061f076..ee62b7d70a49 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1 +1,2 @@
 DIST epiphany-40.1.tar.xz 5374236 BLAKE2B 71508de3554ef646061ab7ff62df8892fed0b7add112309d2660ed3795fee3e2e9460bbc80c7cec402e1922eafffcffae7845761a23b13f3245f5a688599e7ba SHA512 8598ae77f8ba446e132a82a256a346ef9b3c1f9b786d24f0fd4f891f75aba476197f3b155e1aa08ffd0b0a9357604b46bea6b9da34d138ff21bc41a46fa24c7f
+DIST epiphany-40.2.tar.xz 5372180 BLAKE2B cd75f645980c37b0cdd92133505cf7961168bf5d67ad0bdf3140f155c737a070f7ffafa63bb8a0e5de175826b79b2ca380a2851e7f1f0454d4f372d48f48c9c7 SHA512 29a5b7e65f7e5decb3c370fc9ae654727cce30f397ffd3289a9f77f3527f0471c821e3bea0f1a5ab9c1ab44e670898b46e66e41de5cb8c76fabd23b135a4a1a9
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/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 7584728e8ddf..5022f4f82358 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-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
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 85373d1ede51..3d1984435d02 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1 +1,2 @@
 DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
+DIST surf-2.1.tar.gz 22555 BLAKE2B 3170b0b26893361ec84f2552051dc85b4a6fc132ff09a2dc2e9256f8ec8cdf93650c41b4d0466ebb5b608e2bde9282c1d1f64bb6f17114c58da7616994473f22 SHA512 06f31f683a941d9a587d908ae7f6949255937b0b0c9c133a18c6fa753c7da75de267adda1c83dd9ba0a8535e2b6d4ff2b5408cc5e8a2e315d4198fe68df5db12
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 4945a5577175..859acea00e53 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -2,6 +2,9 @@ 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
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 332a3cae23a6..50ca5dbbee12 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
 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
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..2b0615a2eb65
--- /dev/null
+++ b/www-plugins/gosuslugi-plugin/Manifest
@@ -0,0 +1,3 @@
+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
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 d4d7e345a934..5169bd911639 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,6 +1 @@
-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
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 8f1e6329f9f4..7ff1125d796e 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,2 +1,3 @@
 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
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 b7a4941efe3a..d2edf6f528f9 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,3 +1,4 @@
 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
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 8f1e6329f9f4..7ff1125d796e 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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/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 484287bc4256..e77014bb262d 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -1,2 +1 @@
-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
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/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 08877cc1ee4a..a1da201b1c06 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,2 +1,3 @@
 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
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/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/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 589601506570..1aa564170f75 100644
--- a/x11-themes/QGnomePlatform/Manifest
+++ b/x11-themes/QGnomePlatform/Manifest
@@ -1,2 +1,2 @@
-DIST QGnomePlatform-0.6.1.tar.gz 28996 BLAKE2B 3d0da37fcc8e85bd59263dffb19865666d25dd50d2c1e00b4d6358d745eb7079f415058ffb75a8228c9c7ed956003a656b3e10a3467d9fc9dcd5eee2c14bf7cd SHA512 5e0bab45a8ff4c56e6e34d636ed719ce1a087f116942dd356253403d4be40aac348ccbdbfc917f65f6cc4df8619e1031734f0a46a36d4d9b7bb4838ded61570c
 DIST QGnomePlatform-0.7.1.tar.gz 33633 BLAKE2B 167039a7de4bbd3cae163022adb94a2bd4764f5a862b8334600f2bc5b7cfe09b6a5facfe656438d05bbf150e10caab9f1aeb910d0aa8d55fbe8995393e89b0d8 SHA512 7e3ba774ee1387604f4c66bd75f9fb4c5305f4553886132e8e3991a3e42564844a7eafb1361e0e8c64743746e315c07b22c11c133be95c1c53afb62c062bfc6e
+DIST QGnomePlatform-0.8.0.tar.gz 37381 BLAKE2B 04aeb04f08441aa4964ddb7a3f0b6afbceead82abb5399d36731c77c6de6b303a7db188094857c8346381940deeb8bcd9c6d24e0521cb10b649209e1f6b8d0a0 SHA512 e862b84024ad77976b52cbacf1f920acaa60d2bfcb8f261f1215f2e5fb2dbe6d99e10aa425be70fa2dd324ac4d8c5b85958d68fae4fb7f9728caf097aa1bd102
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 018f39abc707..046284aa15ab 100644
--- a/x11-themes/adwaita-qt/Manifest
+++ b/x11-themes/adwaita-qt/Manifest
@@ -1,3 +1,2 @@
-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
+DIST adwaita-qt-1.3.1.tar.gz 438788 BLAKE2B 8c5585f51eeca86225f9162d47e6d7bee6e912120af0a692a85417b9d7c95b32a08e9329e3a60190148832cceeb154fcca932dafc84b4e9d26ced3a661c3eca4 SHA512 2f6f0e76a7ea35151ea6a2c7f6d8f4714b738935bfecf10be9abb243bee6f297bbe7a31593ca2a17eea1767b26d4d420aadb5ba2c4c11792169579eab4bdd439
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/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/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 91e0df75ff96..5001a621c3b2 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,3 +1,2 @@
 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
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 042e63bb12d1..5267f8a2b3a8 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,3 +1,3 @@
 DIST icewm-2.2.1.tar.lz 1697220 BLAKE2B a1c236c5aa3f2b958f3ad53c6d757abbce344da3c1c9c8f49bd4c986c68aef7421e799100dfabcb03e612d4c6a44af6a063080730b054e96ee054c85c21d5d1e SHA512 700122ace9a120300a06f17f334b76c12395154693583587527254903f53d12feb6e991754fc714960cc78b0d7809202879e43f2508f4d7ffa3fc7af84e628d6
-DIST icewm-2.3.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
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/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